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

Commit dc7cb29a authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "binderRpcTest: BinderRpc.Java skip on user builds." am: bec007aa am:... 

Merge "binderRpcTest: BinderRpc.Java skip on user builds." am: bec007aa am: a35efd53 am: 815c5959

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

Change-Id: I9668513adbfe1f31850a12493fb3781be0f73e59
parents cba14f5e 815c5959

libs/binder/tests/binderRpcTest.cpp

+4 −3
Original line number Original line Diff line number Diff line
@@ -1517,10 +1517,11 @@ TEST(BinderRpc, Java) { 
    auto keepAlive = sp<BBinder>::make();

    auto keepAlive = sp<BBinder>::make();

    auto setRpcClientDebugStatus = binder->setRpcClientDebug(std::move(socket), keepAlive);

    auto setRpcClientDebugStatus = binder->setRpcClientDebug(std::move(socket), keepAlive);





    if (!android::base::GetBoolProperty("ro.debuggable", false)) {

    if (!android::base::GetBoolProperty("ro.debuggable", false) ||

        android::base::GetProperty("ro.build.type", "") == "user") {

        ASSERT_EQ(INVALID_OPERATION, setRpcClientDebugStatus)

        ASSERT_EQ(INVALID_OPERATION, setRpcClientDebugStatus)

                << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable builds, "

                << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable or user "

                   "but get "

                   "builds, but get "

                << statusToString(setRpcClientDebugStatus);

                << statusToString(setRpcClientDebugStatus);

        GTEST_SKIP();

        GTEST_SKIP();

    }

    }