commit 71148066864ecea570b60dae8cbfa7e9aa2c19a0
author Steven Moreland <smoreland@google.com> Thu Sep 23 19:05:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 23 19:05:16 2021 +0000
tree 7c1550ce0b25e69f07be4d5509c1176cc013c5cb
parent 09bff825abeb7c1b165923a486a153fcf18e0cb7
parent fd56d6a6ad4e756290090e0aa4f939034dc9ee5a

Merge changes I4f475748,I633b634f am: f24415a9aa am: 53e7c220ee am: cb7bee4824 am: fd56d6a6ad

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1833318

Change-Id: I0e49fc7249f508d0d0404f6df5cb499ba9c5cc80

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 7575252..4ecf4b3 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -233,7 +233,7 @@
                 ALOGE("null proxy");
             } else {
                 if (proxy->isRpcBinder()) {
-                    ALOGE("Sending a socket binder over RPC is prohibited");
+                    ALOGE("Sending a socket binder over kernel binder is prohibited");
                     return INVALID_OPERATION;
                 }
             }

libs/binder/ndk/status.cpp

diff --git a/libs/binder/ndk/status.cpp b/libs/binder/ndk/status.cpp
index a8ae441..8ed91a5 100644
--- a/libs/binder/ndk/status.cpp
+++ b/libs/binder/ndk/status.cpp
@@ -20,6 +20,7 @@
 #include <android-base/logging.h>
 
 using ::android::status_t;
+using ::android::statusToString;
 using ::android::binder::Status;
 
 AStatus* AStatus_newOk() {
@@ -126,7 +127,7 @@
             return STATUS_UNKNOWN_ERROR;
 
         default:
-            LOG(WARNING) << __func__ << ": Unknown status_t (" << status
+            LOG(WARNING) << __func__ << ": Unknown status_t (" << statusToString(status)
                          << ") pruned into STATUS_UNKNOWN_ERROR";
             return STATUS_UNKNOWN_ERROR;
     }