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

Commit 3881e39c authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: conditional experimental protocol" into main am: c699f8ff 

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



Change-Id: I74d9cc2846a676ee02fcc8a2d76c73afd2b0e4b5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87425707 c699f8ff

libs/binder/RpcState.cpp

+2 −1
Original line number Diff line number Diff line
@@ -408,10 +408,11 @@ bool RpcState::validateProtocolVersion(uint32_t version) { 
        char codename[PROPERTY_VALUE_MAX];

        property_get("ro.build.version.codename", codename, "");

        if (!strcmp(codename, "REL")) {

            ALOGE("Cannot use experimental RPC binder protocol on a release branch.");

            ALOGE("Cannot use experimental RPC binder protocol in a release configuration.");

            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

libs/binder/tests/binderRpcTestCommon.h

+12 −1
Original line number Diff line number Diff line
@@ -70,12 +70,23 @@ static inline std::vector<RpcSecurity> RpcSecurityValues() { 
    return {RpcSecurity::RAW, RpcSecurity::TLS};

}



static inline bool hasExperimentalRpc() {

#ifdef __ANDROID__

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

#else

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

    return true;

#endif

}



static inline std::vector<uint32_t> testVersions() {

    std::vector<uint32_t> versions;

    for (size_t i = 0; i < RPC_WIRE_PROTOCOL_VERSION_NEXT; i++) {

        versions.push_back(i);

    }

    if (hasExperimentalRpc()) {

        versions.push_back(RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL);

    }

    return versions;

}

libs/binder/tests/binderRpcUniversalTests.cpp

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ TEST(BinderRpc, CannotUseNextWireVersion) { 


TEST(BinderRpc, CanUseExperimentalWireVersion) {

    auto session = RpcSession::make();

    EXPECT_TRUE(session->setProtocolVersion(RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL));

    EXPECT_EQ(hasExperimentalRpc(),

              session->setProtocolVersion(RPC_WIRE_PROTOCOL_VERSION_EXPERIMENTAL));

}



TEST_P(BinderRpc, Ping) {