summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-04-18 03:44:29 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-04-18 03:44:29 +0000
commit4bcaeb12eaa2175d7722f2ca45f6299e9a2101e1 (patch)
tree1f412869829e173caa331b009defada816965b8b /libs
parent305ab7116eadcb4ee4bdc81ab8e4004adf59af15 (diff)
parent6a66bfd4cb3091d61a80914ac5aa751257d2b26b (diff)
Merge "libbinder RPC: Trusty always use stable wire proto"
Diffstat (limited to 'libs')
-rw-r--r--libs/binder/trusty/RpcServerTrusty.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/trusty/RpcServerTrusty.cpp b/libs/binder/trusty/RpcServerTrusty.cpp
index 3a99606ec9..68b000849c 100644
--- a/libs/binder/trusty/RpcServerTrusty.cpp
+++ b/libs/binder/trusty/RpcServerTrusty.cpp
@@ -65,6 +65,10 @@ RpcServerTrusty::RpcServerTrusty(std::unique_ptr<RpcTransportCtx> ctx, std::stri
mTipcPort.msg_queue_len = 6; // Three each way
mTipcPort.priv = this;
+ // TODO(b/266741352): follow-up to prevent needing this in the future
+ // Trusty needs to be set to the latest stable version that is in prebuilts there.
+ mRpcServer->setProtocolVersion(0);
+
if (mPortAcl) {
// Initialize the array of pointers to uuids.
// The pointers in mUuidPtrs should stay valid across moves of