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

Merge "Rename isHandlingTransaction to isDirectlyHandlingTransaction" am: 7eb7f9efaf am: 0a3a353ec0 am: 84dc08e004

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1818907

Change-Id: I2403dd12f5ef54dd79bf46cc5e1cdb976b7285d2
This commit is contained in:
Treehugger Robot
2021-10-25 21:04:09 +00:00
committed by Automerger Merge Worker
parent c8f667a1e9 84dc08e004
commit 1f4f565bf0
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/Binder.java
View File

@@ -313,7 +313,7 @@ public class Binder implements IBinder {
* @hide * @hide
*/ */
@CriticalNative @CriticalNative
public static final native boolean isHandlingTransaction(); public static final native boolean isDirectlyHandlingTransaction();
/** /**
* Return the Linux uid assigned to the process that sent the transaction * Return the Linux uid assigned to the process that sent the transaction
@@ -323,7 +323,7 @@ public class Binder implements IBinder {
* executing an incoming transaction. * executing an incoming transaction.
*/ */
public static final int getCallingUidOrThrow() { public static final int getCallingUidOrThrow() {
if (!isHandlingTransaction()) { if (!isDirectlyHandlingTransaction()) {
throw new IllegalStateException( throw new IllegalStateException(
"Thread is not in a binder transcation"); "Thread is not in a binder transcation");
} }

7
core/jni/android_util_Binder.cpp
View File

@@ -959,8 +959,7 @@ static jint android_os_Binder_getCallingUid()
return IPCThreadState::self()->getCallingUid(); return IPCThreadState::self()->getCallingUid();
} }
static jboolean android_os_Binder_isHandlingTransaction() static jboolean android_os_Binder_isDirectlyHandlingTransaction() {
{
return getCurrentServingCall() == BinderCallType::BINDER; return getCurrentServingCall() == BinderCallType::BINDER;
} }
@@ -1056,6 +1055,7 @@ static void android_os_Binder_setExtension(JNIEnv* env, jobject obj, jobject ext
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// clang-format off
static const JNINativeMethod gBinderMethods[] = { static const JNINativeMethod gBinderMethods[] = {
/* name, signature, funcPtr */ /* name, signature, funcPtr */
// @CriticalNative // @CriticalNative
@@ -1063,7 +1063,7 @@ static const JNINativeMethod gBinderMethods[] = {
// @CriticalNative // @CriticalNative
{ "getCallingUid", "()I", (void*)android_os_Binder_getCallingUid }, { "getCallingUid", "()I", (void*)android_os_Binder_getCallingUid },
// @CriticalNative // @CriticalNative
{ "isHandlingTransaction", "()Z", (void*)android_os_Binder_isHandlingTransaction }, { "isDirectlyHandlingTransaction", "()Z", (void*)android_os_Binder_isDirectlyHandlingTransaction },
// @CriticalNative // @CriticalNative
{ "clearCallingIdentity", "()J", (void*)android_os_Binder_clearCallingIdentity }, { "clearCallingIdentity", "()J", (void*)android_os_Binder_clearCallingIdentity },
// @CriticalNative // @CriticalNative
@@ -1088,6 +1088,7 @@ static const JNINativeMethod gBinderMethods[] = {
{ "getExtension", "()Landroid/os/IBinder;", (void*)android_os_Binder_getExtension }, { "getExtension", "()Landroid/os/IBinder;", (void*)android_os_Binder_getExtension },
{ "setExtension", "(Landroid/os/IBinder;)V", (void*)android_os_Binder_setExtension }, { "setExtension", "(Landroid/os/IBinder;)V", (void*)android_os_Binder_setExtension },
}; };
// clang-format on
const char* const kBinderPathName = "android/os/Binder"; const char* const kBinderPathName = "android/os/Binder";