Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use libbinderthreadstateutils." am: e1cebc7556

Browse Source 
Change-Id: I2c746d852ed7e7bbd664da91a24cd6aa24b7092e
This commit is contained in:
Automerger Merge Worker
2020-02-06 19:22:27 +00:00
parent cd57c919be e1cebc7556
commit 800028c960
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/jni/Android.bp
View File

@@ -233,6 +233,7 @@ cc_library_shared {
static_libs: [ static_libs: [
"libasync_safe", "libasync_safe",
"libbinderthreadstateutils",
"libdmabufinfo", "libdmabufinfo",
"libgif", "libgif",
"libseccomp_policy", "libseccomp_policy",

3
core/jni/android_util_Binder.cpp
View File

@@ -37,6 +37,7 @@
#include <binder/Parcel.h> #include <binder/Parcel.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <binder/Stability.h> #include <binder/Stability.h>
#include <binderthreadstate/CallerUtils.h>
#include <cutils/atomic.h> #include <cutils/atomic.h>
#include <log/log.h> #include <log/log.h>
#include <utils/KeyedVector.h> #include <utils/KeyedVector.h>
@@ -946,7 +947,7 @@ static jint android_os_Binder_getCallingUid()
static jboolean android_os_Binder_isHandlingTransaction() static jboolean android_os_Binder_isHandlingTransaction()
{ {
return IPCThreadState::self()->isServingCall(); return getCurrentServingCall() == BinderCallType::BINDER;
} }
static jlong android_os_Binder_clearCallingIdentity() static jlong android_os_Binder_clearCallingIdentity()