commit dc7cb29ae9e2b13d19ca736d535e8a330a8678cf
author Yifan Hong <elsk@google.com> Fri Jan 14 05:15:22 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 14 05:15:22 2022 +0000
tree 27ab28a334e3b882804f15e2b307da29b4924dbd
parent cba14f5ec65962a449d2f6a494162829cf752512
parent 815c5959d428e5f2af3de11ba291b566a9ef03e1

Merge "binderRpcTest: BinderRpc.Java skip on user builds." am: bec007aad9 am: a35efd5363 am: 815c5959d4

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

Change-Id: I9668513adbfe1f31850a12493fb3781be0f73e59

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index ca68b99..c2639e7 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -1517,10 +1517,11 @@
     auto keepAlive = sp<BBinder>::make();
     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)
-                << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable builds, "
-                   "but get "
+                << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable or user "
+                   "builds, but get "
                 << statusToString(setRpcClientDebugStatus);
         GTEST_SKIP();
     }