commit a90b4e7b44c3043bb1979bb981f65ce36d67222d
author Eric Biggers <ebiggers@google.com> Tue Mar 15 23:40:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 15 23:40:05 2022 +0000
tree 3fd69d0c0fb8cdab9a464da7c702acf84777586a
parent dba92c2a356cb601fd3daf51fedce526c4752684
parent 7f0fdc14f5f80f741a0f45dbb0d5f7beed617e95

Merge "Clarify meaning of key parameter to AStorageManager_mountObb()"

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 504c6c2..a217a15 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1862,6 +1862,7 @@
 {
     status_t status = readNullableStrongBinder(val);
     if (status == OK && !val->get()) {
+        ALOGW("Expecting binder but got null!");
         status = UNEXPECTED_NULL;
     }
     return status;

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index e73c3b8..71a1291 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -113,7 +113,7 @@
                 "frameworks/native/libs/arect/include",
             ],
         },
-        linux_glibc: {
+        host_linux: {
             srcs: [
                 "InputTransport.cpp",
                 "android/os/IInputConstants.aidl",