commit cb7bee4824133df6d4be4e802e5b5895b7948d8a
author Steven Moreland <smoreland@google.com> Thu Sep 23 18:16:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 23 18:16:57 2021 +0000
tree 1ea68af5b7708ba121bff6ffbe35b6a0dce2e34f
parent 0c401248bb0c951394ec23fe5a668ab38e5a7c7a
parent 53e7c220eee0f73ccd4041c60ec7fbcbb6879264

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

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

Change-Id: I0bd6574e80ad3eb2c7538fcda7cc296340afde28

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;
     }