commit 5ec743f65fe48a6098ab5a564eeba012405634d7
author Steven Moreland <smoreland@google.com> Wed Jan 18 01:02:06 2023 +0000
committer Steven Moreland <smoreland@google.com> Wed Jan 18 22:05:45 2023 +0000
tree 34466fd9019008f6bb603959042336c968460e01
parent bcb91683b14b851bca61eedeb3d607ba5f026c12

libbinder: softer error for linkToDeath lack of threads

Most code will be handling an error condition here, and we don't
necessarily want to rewrite corresponding client code when we use
RPC binder.

Change-Id: Ia6cb1900dc55092625e02a734960fb5b0023340a
Fixes: 264477724
Test: N/A

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 8afa49b..8470f82 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -682,7 +682,7 @@
     proc.expectAlreadyShutdown = true;
 }
 
-TEST_P(BinderRpc, DeathRecipientFatalWithoutIncoming) {
+TEST_P(BinderRpc, DeathRecipientFailsWithoutIncoming) {
     class MyDeathRec : public IBinder::DeathRecipient {
     public:
         void binderDied(const wp<IBinder>& /* who */) override {}
@@ -692,8 +692,7 @@
             {.numThreads = 1, .numSessions = 1, .numIncomingConnections = 0});
 
     auto dr = sp<MyDeathRec>::make();
-    EXPECT_DEATH(proc.rootBinder->linkToDeath(dr, (void*)1, 0),
-                 "Cannot register a DeathRecipient without any incoming connections.");
+    EXPECT_EQ(INVALID_OPERATION, proc.rootBinder->linkToDeath(dr, (void*)1, 0));
 }
 
 TEST_P(BinderRpc, UnlinkDeathRecipient) {