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

Commit 1e89bb4c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinderthreadstateutils: don't init binder" am: a77d7d8d am:... 

Merge "libbinderthreadstateutils: don't init binder" am: a77d7d8d am: f1c49071 am: af54b6ec am: 5cd6a96a

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



Change-Id: I719bdcbf2a6216a814290abf2940492c5ee0a2e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d57b9698 5cd6a96a

libs/binderthreadstate/include/binderthreadstate/CallerUtils.h

+6 −2
Original line number Diff line number Diff line
@@ -36,8 +36,12 @@ enum class BinderCallType { 
// Based on where we are in recursion of nested binder/hwbinder calls, determine

// which one we are closer to.

inline static BinderCallType getCurrentServingCall() {

    const void* hwbinderSp = android::hardware::IPCThreadState::self()->getServingStackPointer();

    const void* binderSp = android::IPCThreadState::self()->getServingStackPointer();

    auto* hwState = android::hardware::IPCThreadState::selfOrNull();

    auto* state = android::IPCThreadState::selfOrNull();



    // getServingStackPointer can also return nullptr

    const void* hwbinderSp = hwState ? hwState->getServingStackPointer() : nullptr;

    const void* binderSp = state ? state->getServingStackPointer() : nullptr;



    if (hwbinderSp == nullptr && binderSp == nullptr) return BinderCallType::NONE;

    if (hwbinderSp == nullptr) return BinderCallType::BINDER;

libs/binderthreadstate/test.cpp

+19 −0
Original line number Diff line number Diff line
@@ -16,11 +16,16 @@ 


#include <BnAidlStuff.h>

#include <android-base/logging.h>

#include <binder/IPCThreadState.h>

#include <binder/IServiceManager.h>

#include <binderthreadstate/CallerUtils.h>

#include <binderthreadstateutilstest/1.0/IHidlStuff.h>

#include <gtest/gtest.h>

#include <hidl/HidlTransportSupport.h>

#include <hwbinder/IPCThreadState.h>



#include <thread>



#include <linux/prctl.h>

#include <sys/prctl.h>
@@ -154,6 +159,20 @@ TEST(BinderThreadState, LocalAidlCall) { 
    EXPECT_TRUE(server->callLocal().isOk());

}



TEST(BinderThreadState, DoesntInitializeBinderDriver) {

    // this is on another thread, because it's testing thread-specific

    // state and we expect it not to be initialized.

    std::thread([&] {

        EXPECT_EQ(nullptr, android::IPCThreadState::selfOrNull());

        EXPECT_EQ(nullptr, android::hardware::IPCThreadState::selfOrNull());



        (void)getCurrentServingCall();



        EXPECT_EQ(nullptr, android::IPCThreadState::selfOrNull());

        EXPECT_EQ(nullptr, android::hardware::IPCThreadState::selfOrNull());

    }).join();

}



TEST(BindThreadState, RemoteHidlCall) {

    auto stuff = IHidlStuff::getService(id2name(kP1Id));

    ASSERT_NE(nullptr, stuff);