diff options
| -rw-r--r-- | libs/binder/BpBinder.cpp | 2 | ||||
| -rw-r--r-- | libs/binder/tests/binderRpcTest.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp index 1c470a11d3..d03326eb04 100644 --- a/libs/binder/BpBinder.cpp +++ b/libs/binder/BpBinder.cpp @@ -388,7 +388,7 @@ status_t BpBinder::linkToDeath( { if (isRpcBinder()) { if (rpcSession()->getMaxIncomingThreads() < 1) { - LOG_ALWAYS_FATAL("Cannot register a DeathRecipient without any incoming connections."); + ALOGE("Cannot register a DeathRecipient without any incoming connections."); return INVALID_OPERATION; } } else if constexpr (!kEnableKernelIpc) { diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp index 9be5b879d4..36c8d8cd50 100644 --- a/libs/binder/tests/binderRpcTest.cpp +++ b/libs/binder/tests/binderRpcTest.cpp @@ -683,7 +683,7 @@ TEST_P(BinderRpc, SingleDeathRecipientOnShutdown) { proc.expectAlreadyShutdown = true; } -TEST_P(BinderRpc, DeathRecipientFatalWithoutIncoming) { +TEST_P(BinderRpc, DeathRecipientFailsWithoutIncoming) { class MyDeathRec : public IBinder::DeathRecipient { public: void binderDied(const wp<IBinder>& /* who */) override {} @@ -693,8 +693,7 @@ TEST_P(BinderRpc, DeathRecipientFatalWithoutIncoming) { {.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) { |