commit a4dede257f61fb29facbdbfa694b00fbe3b494c4
author android-build-team Robot <android-build-team-robot@google.com> Wed Apr 22 02:13:20 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Apr 22 02:13:20 2020 +0000
tree 80cba3b730cd26315e59d3fa9edc31b153392138
parent 2a7e8cc2f9bd8ac477db3e74592a1992e886b60f
parent 6cf416a7f6a25d9a7a9f0faa5e6f9382d13be4be

Snap for 6415107 from 6cf416a7f6a25d9a7a9f0faa5e6f9382d13be4be to rvc-d1-release

Change-Id: Ic946f425f5390626ec5a830b711c67f913114532

Android.bp

diff --git a/Android.bp b/Android.bp
index 987e36a..57b3c10 100644
--- a/Android.bp
+++ b/Android.bp
@@ -88,6 +88,14 @@
     host_supported: true,
     recovery_available: true,
     vendor_available: true,
+    apex_available: [
+        "//apex_available:platform",
+        "com.android.neuralnetworks",
+        "com.android.bluetooth.updatable",
+        "com.android.media",
+        "com.android.media.swcodec",
+        "com.android.tethering",
+    ],
 }
 
 // Only libhwbinder_benchmark needs to have pgo enabled. When all places

IPCThreadState.cpp

diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index 4baa5cb..2f4464d 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -963,7 +963,11 @@
     if (err >= NO_ERROR) {
         if (bwr.write_consumed > 0) {
             if (bwr.write_consumed < mOut.dataSize())
-                mOut.remove(0, bwr.write_consumed);
+                LOG_ALWAYS_FATAL("Driver did not consume write buffer. "
+                                 "err: %s consumed: %zu of %zu",
+                                 statusToString(err).c_str(),
+                                 (size_t)bwr.write_consumed,
+                                 mOut.dataSize());
             else {
                 mOut.setDataSize(0);
                 processPostWriteDerefs();