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

Commit c2b71d5f authored by Tomasz Wasilczyk's avatar Tomasz Wasilczyk
Browse files

Don't use Android properties outside of Android 

Bug: 302723053
Test: mma
Change-Id: I4c3e38a629ebc17495ac4d9b05360da5f5101dca
parent b13bfbd9

libs/binder/tests/binderRpcTest.cpp

+6 −3
Original line number Diff line number Diff line
@@ -1358,7 +1358,11 @@ private: 
};



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 @@ TEST(BinderRpc, Java) { 
    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 "

libs/binder/tests/binderRpcTestCommon.h

+4 −1
Original line number Diff line number Diff line
@@ -36,9 +36,12 @@ 
#include <string>

#include <vector>



#ifdef __ANDROID__

#include <android-base/properties.h>

#endif



#ifndef __TRUSTY__

#include <android-base/file.h>

#include <android-base/properties.h>

#include <android/binder_auto_utils.h>

#include <android/binder_libbinder.h>

#include <binder/ProcessState.h>