commit 6904ed53436e759827ac03df35be56940bafd134
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 18 03:44:29 2023 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Apr 17 20:45:01 2023 -0700
tree b41ff94317cd362dfc28e52b6065a9f44b30580f
parent dbb12130afa4f9d30cd11d0f18b523ed51297892

Merge "libbinder RPC: Trusty always use stable wire proto"

GitOrigin-RevId: 4bcaeb12eaa2175d7722f2ca45f6299e9a2101e1
Change-Id: I88cc8f2417f33c9f84cfb22913946f18314ed285

libs/binder/trusty/RpcServerTrusty.cpp

diff --git a/libs/binder/trusty/RpcServerTrusty.cpp b/libs/binder/trusty/RpcServerTrusty.cpp
index 3a99606..68b0008 100644
--- a/libs/binder/trusty/RpcServerTrusty.cpp
+++ b/libs/binder/trusty/RpcServerTrusty.cpp
@@ -65,6 +65,10 @@
     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