commit 68a556190553a4060babf4a4e5cb1bb16ae61ab2
author Andrei Homescu <ahomescu@google.com> Tue Aug 02 01:25:15 2022 +0000
committer Andrei Homescu <ahomescu@google.com> Fri Jan 20 08:55:58 2023 +0000
tree f0bca0d8da3a13ec5d84a03211e34f562f391840
parent 1d5c6a069bd892213cd7e9737846ca8434ebec13

libbinder: Add Trusty IPC support to binderRpcTest

Add a new SocketType::TIPC socket to binderRpcTest
that is used to connect to the test service in Trusty.
This enables binderRpcTest on the connection between
Android and Trusty.

Bug: 230135749
Test: atest binderRpcTest on qemu_trusty_arm64
Change-Id: I10c77bab586e6f6a44117c3b376d591ed5e0b1fb

libs/binder/tests/binderRpcTestFixture.h

diff --git a/libs/binder/tests/binderRpcTestFixture.h b/libs/binder/tests/binderRpcTestFixture.h
index 5a78782..c99d68a 100644
--- a/libs/binder/tests/binderRpcTestFixture.h
+++ b/libs/binder/tests/binderRpcTestFixture.h
@@ -106,6 +106,10 @@
 
     // Whether the test params support sending FDs in parcels.
     bool supportsFdTransport() const {
+        if (socketType() == SocketType::TIPC) {
+            // Trusty does not support file descriptors yet
+            return false;
+        }
         return clientVersion() >= 1 && serverVersion() >= 1 && rpcSecurity() != RpcSecurity::TLS &&
                 (socketType() == SocketType::PRECONNECTED || socketType() == SocketType::UNIX ||
                  socketType() == SocketType::UNIX_BOOTSTRAP ||