commit d15e50b3a540384c9a148edd495d51f5ce17a41d
author Steven Moreland <smoreland@google.com> Wed Jul 08 17:00:57 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 17:00:57 2020 +0000
tree 7cf4d9264f53e136ea138a3f95d287a35033e62d
parent 31784f6cbd9353363cfb25e885f053ddf6930f92
parent 54fffc5b6585f77e59c3738117b0958c6fa959a1

Merge "libbinder_ndk: dead binder when associating dead binder" am: b46521f500 am: 54fffc5b65

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

Change-Id: I13d54d9da85e1a5245776dba170b2eec98e87af1

libs/binder/ndk/ibinder.cpp

diff --git a/libs/binder/ndk/ibinder.cpp b/libs/binder/ndk/ibinder.cpp
index 649faa1..743ef89 100644
--- a/libs/binder/ndk/ibinder.cpp
+++ b/libs/binder/ndk/ibinder.cpp
@@ -99,8 +99,14 @@
 
     String8 descriptor(getBinder()->getInterfaceDescriptor());
     if (descriptor != newDescriptor) {
-        LOG(ERROR) << __func__ << ": Expecting binder to have class '" << newDescriptor.c_str()
-                   << "' but descriptor is actually '" << descriptor.c_str() << "'.";
+        if (getBinder()->isBinderAlive()) {
+            LOG(ERROR) << __func__ << ": Expecting binder to have class '" << newDescriptor.c_str()
+                       << "' but descriptor is actually '" << descriptor.c_str() << "'.";
+        } else {
+            // b/155793159
+            LOG(ERROR) << __func__ << ": Cannot associate class '" << newDescriptor.c_str()
+                       << "' to dead binder.";
+        }
         return false;
     }