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

Commit 0f615324 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge "Use libbinderthreadstateutils."

parents 0caf9e48 d6050968

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ cc_library_shared { 


            static_libs: [

                "libasync_safe",

                "libbinderthreadstateutils",

                "libdmabufinfo",

                "libgif",

                "libseccomp_policy",

core/jni/android_util_Binder.cpp

+2 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <binder/Parcel.h>

#include <binder/ProcessState.h>

#include <binder/Stability.h>

#include <binderthreadstate/CallerUtils.h>

#include <cutils/atomic.h>

#include <log/log.h>

#include <utils/KeyedVector.h>
@@ -950,7 +951,7 @@ static jint android_os_Binder_getCallingUid() 


static jboolean android_os_Binder_isHandlingTransaction()

{

    return IPCThreadState::self()->isServingCall();

    return getCurrentServingCall() == BinderCallType::BINDER;

}



static jlong android_os_Binder_clearCallingIdentity()