| commit | 62f246fd84b22f9ae7f56e5b51ffc9251f210ffb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Apr 18 04:06:22 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 18 04:06:22 2023 +0000 |
| tree | 1f412869829e173caa331b009defada816965b8b | |
| parent | d8096153ba949ec0fbd14e2998cdd603cae88b14 [diff] | |
| parent | 4bcaeb12eaa2175d7722f2ca45f6299e9a2101e1 [diff] |
Merge "libbinder RPC: Trusty always use stable wire proto" am: 4bcaeb12ea Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2541634 Change-Id: I934697268353de2f228712e31fc4907146cb53bb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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