Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bf667f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder RPC: Trusty always use stable wire proto" am: 4bcaeb12 am:... 

Merge "libbinder RPC: Trusty always use stable wire proto" am: 4bcaeb12 am: 62f246fd am: d41c76e3 am: 6ec6c426 am: 432b6d13

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2541634



Change-Id: Ic51e1c5dc8936a12740a96bd8364943ce4d2eabe
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4dfc0604 432b6d13

libs/binder/trusty/RpcServerTrusty.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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