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

Commit a86cf8cb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use libbinderthreadstateutils." am: e1cebc75 am: 800028c9 

Change-Id: Id4985caaf0ee7c4692cf296c7ce88ce3bbbac2cd
parents d30fed6d 800028c9

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,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>
@@ -946,7 +947,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()