commit b46521f5005f881e35ab6ff96e5b5cf7044d5474
author Steven Moreland <smoreland@google.com> Wed Jul 08 16:42:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 08 16:42:47 2020 +0000
tree d19ebfc698ba7391fd2a17b438fe491a065702e3
parent 87099b04c35331af0bceeef07c017dc546fa1a45
parent 640c409ebc6168acf3f8621c6ba9092b8e27a649

Merge "libbinder_ndk: dead binder when associating dead binder"

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