commit c2b71d5f12f82bbf8d9f08c2be4f54488f1fc5ca
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Nov 06 16:32:12 2023 -0800
committer Tomasz Wasilczyk <twasilczyk@google.com> Mon Nov 13 12:07:12 2023 -0800
tree 19d76d3418d079373329957d2ace057ec1dd10c8
parent b13bfbd912565814145e2a894c2b753f2ead760f

Don't use Android properties outside of Android

Bug: 302723053
Test: mma
Change-Id: I4c3e38a629ebc17495ac4d9b05360da5f5101dca

libs/binder/tests/binderRpcTest.cpp

diff --git a/libs/binder/tests/binderRpcTest.cpp b/libs/binder/tests/binderRpcTest.cpp
index 05b9b6c..b86eb94 100644
--- a/libs/binder/tests/binderRpcTest.cpp
+++ b/libs/binder/tests/binderRpcTest.cpp
@@ -1358,7 +1358,11 @@
 };
 
 TEST(BinderRpc, Java) {
-#if !defined(__ANDROID__)
+    bool expectDebuggable = false;
+#if defined(__ANDROID__)
+    expectDebuggable = android::base::GetBoolProperty("ro.debuggable", false) &&
+            android::base::GetProperty("ro.build.type", "") != "user";
+#else
     GTEST_SKIP() << "This test is only run on Android. Though it can technically run on host on"
                     "createRpcDelegateServiceManager() with a device attached, such test belongs "
                     "to binderHostDeviceTest. Hence, just disable this test on host.";
@@ -1386,8 +1390,7 @@
     auto keepAlive = sp<BBinder>::make();
     auto setRpcClientDebugStatus = binder->setRpcClientDebug(std::move(socket), keepAlive);
 
-    if (!android::base::GetBoolProperty("ro.debuggable", false) ||
-        android::base::GetProperty("ro.build.type", "") == "user") {
+    if (!expectDebuggable) {
         ASSERT_EQ(INVALID_OPERATION, setRpcClientDebugStatus)
                 << "setRpcClientDebug should return INVALID_OPERATION on non-debuggable or user "
                    "builds, but get "