commit a08546707ce4dd72997c9b30b118d8ce86612f9b
author Steven Moreland <smoreland@google.com> Thu May 20 01:18:54 2021 +0000
committer Steven Moreland <smoreland@google.com> Thu May 20 01:20:33 2021 +0000
tree 85a725cc8568fcbce99b4b21aced52f821a07309
parent 4ec3c43c8a9f16f90ab5830c4aa1e238a0c248cf

libbinder: RpcServer privatize acceptOne

This doesn't configure RpcServer w/ a way to be shutdown, and we don't
really need it, so simplifying things.

Bug: 185167543
Test: N/A
Change-Id: I7648ff04f6096f215a90caf3b9f21060eca882ac

libs/binder/RpcServer.cpp

diff --git a/libs/binder/RpcServer.cpp b/libs/binder/RpcServer.cpp
index 249ce6c..1128057 100644
--- a/libs/binder/RpcServer.cpp
+++ b/libs/binder/RpcServer.cpp
@@ -139,7 +139,7 @@
     }
 
     while (mShutdownTrigger->triggerablePollRead(mServer)) {
-        (void)acceptOneNoCheck();
+        (void)acceptOne();
     }
 
     {
@@ -150,12 +150,6 @@
 }
 
 bool RpcServer::acceptOne() {
-    LOG_ALWAYS_FATAL_IF(!mAgreedExperimental, "no!");
-    LOG_ALWAYS_FATAL_IF(!hasServer(), "RpcServer must be setup to acceptOne.");
-    return acceptOneNoCheck();
-}
-
-bool RpcServer::acceptOneNoCheck() {
     unique_fd clientFd(
             TEMP_FAILURE_RETRY(accept4(mServer.get(), nullptr, nullptr /*length*/, SOCK_CLOEXEC)));