Add keepAliveBinder argument to setRpcClientDebug.
When the given binder object dies, the corresponding
RpcServer is also shut down.
This CL does not make use of the argument other than
null checks. See follow-up CL for implementation.
Test: binderLibTest
Bug: 182914638
Change-Id: Id787e70f885b165db703e7bb6fa01e6bec271fe6
diff --git a/libs/binder/servicedispatcher.cpp b/libs/binder/servicedispatcher.cpp
index a2fa842..0c677a8 100644
--- a/libs/binder/servicedispatcher.cpp
+++ b/libs/binder/servicedispatcher.cpp
@@ -26,9 +26,11 @@
#include <binder/IServiceManager.h>
#include <binder/RpcServer.h>
+using android::BBinder;
using android::defaultServiceManager;
using android::OK;
using android::RpcServer;
+using android::sp;
using android::statusToString;
using android::String16;
using android::base::Basename;
@@ -74,7 +76,8 @@
return EX_SOFTWARE;
}
auto socket = rpcServer->releaseServer();
- auto status = binder->setRpcClientDebug(std::move(socket));
+ auto keepAliveBinder = sp<BBinder>::make();
+ auto status = binder->setRpcClientDebug(std::move(socket), keepAliveBinder);
if (status != OK) {
LOG(ERROR) << "setRpcClientDebug failed with " << statusToString(status);
return EX_SOFTWARE;