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

Commit 861604ed authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RPC Binder: limit experimental wire protocol use" into main am: 9ddc976d 

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



Change-Id: I57c9c591802b4e6a263779d827629e1a665a85a2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f3cb023 9ddc976d

libs/binder/RpcState.cpp

+2 −4
Original line number Diff line number Diff line
@@ -412,10 +412,8 @@ bool RpcState::validateProtocolVersion(uint32_t version) { 
            return false;

        }

#else

        // TODO(b/305983144)

        // don't restrict on other platforms, though experimental should

        // only really be used for testing, we don't have a good way to see

        // what is shipping outside of Android

        ALOGE("Cannot use experimental RPC binder protocol outside of Android.");

        return false;

#endif

    } else if (version >= RPC_WIRE_PROTOCOL_VERSION_NEXT) {

        ALOGE("Cannot use RPC binder protocol version %u which is unknown (current protocol "

libs/binder/tests/binderRpcTestCommon.h

+1 −2
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static inline bool hasExperimentalRpc() { 
#ifdef __ANDROID__

    return base::GetProperty("ro.build.version.codename", "") != "REL";

#else

    // TODO(b/305983144): restrict on other platforms

    return true;

    return false;

#endif

}