commit 1ef010bf2fb39c31457b84d6ccac14e71d5bd1f7
author Alice Wang <aliceywang@google.com> Mon Nov 14 09:09:25 2022 +0000
committer Alice Wang <aliceywang@google.com> Tue Nov 15 09:11:46 2022 +0000
tree 0f933b7f90214aba7f839f5b1ba0bed2de5f4356
parent 213454462ca60ec8af20f69a797bbef19712b85b

[rpc_binder][test] Merge unixBootstrapFd and socketFd in binderRpcTest

This is a follow-up of the cl aosp/2267564.

Test: atest binderRpcTest
Change-Id: I5bf68197aa5f34cc3f700dcc70419fcc0acfb1ef

libs/binder/tests/binderRpcTestService.cpp

diff --git a/libs/binder/tests/binderRpcTestService.cpp b/libs/binder/tests/binderRpcTestService.cpp
index cc40995..995e761 100644
--- a/libs/binder/tests/binderRpcTestService.cpp
+++ b/libs/binder/tests/binderRpcTestService.cpp
@@ -42,7 +42,7 @@
     server->setSupportedFileDescriptorTransportModes(serverSupportedFileDescriptorTransportModes);
 
     unsigned int outPort = 0;
-    base::unique_fd unixBootstrapFd(serverConfig.unixBootstrapFd);
+    base::unique_fd socketFd(serverConfig.socketFd);
 
     switch (socketType) {
         case SocketType::PRECONNECTED:
@@ -52,10 +52,10 @@
                     << serverConfig.addr;
             break;
         case SocketType::UNIX_BOOTSTRAP:
-            CHECK_EQ(OK, server->setupUnixDomainSocketBootstrapServer(std::move(unixBootstrapFd)));
+            CHECK_EQ(OK, server->setupUnixDomainSocketBootstrapServer(std::move(socketFd)));
             break;
         case SocketType::UNIX_RAW:
-            CHECK_EQ(OK, server->setupRawSocketServer(base::unique_fd(serverConfig.socketFd)));
+            CHECK_EQ(OK, server->setupRawSocketServer(std::move(socketFd)));
             break;
         case SocketType::VSOCK:
             CHECK_EQ(OK, server->setupVsockServer(serverConfig.vsockPort));