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

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

Merge "Rename isHandlingTransaction to isDirectlyHandlingTransaction" am:... 

Merge "Rename isHandlingTransaction to isDirectlyHandlingTransaction" am: 7eb7f9ef am: 0a3a353e am: 84dc08e0

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

Change-Id: I2403dd12f5ef54dd79bf46cc5e1cdb976b7285d2
parents c8f667a1 84dc08e0

core/java/android/os/Binder.java

+2 −2
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ public class Binder implements IBinder { 
     * @hide

     */

    @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
@@ -323,7 +323,7 @@ public class Binder implements IBinder { 
     *        executing an incoming transaction.

     */

    public static final int getCallingUidOrThrow() {

        if (!isHandlingTransaction()) {

        if (!isDirectlyHandlingTransaction()) {

            throw new IllegalStateException(

                  "Thread is not in a binder transcation");

        }

core/jni/android_util_Binder.cpp

+4 −3
Original line number Diff line number Diff line
@@ -959,8 +959,7 @@ static jint android_os_Binder_getCallingUid() 
    return IPCThreadState::self()->getCallingUid();

}



static jboolean android_os_Binder_isHandlingTransaction()

{

static jboolean android_os_Binder_isDirectlyHandlingTransaction() {

    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[] = {

     /* name, signature, funcPtr */

    // @CriticalNative
@@ -1063,7 +1063,7 @@ static const JNINativeMethod gBinderMethods[] = { 
    // @CriticalNative

    { "getCallingUid", "()I", (void*)android_os_Binder_getCallingUid },

    // @CriticalNative

    { "isHandlingTransaction", "()Z", (void*)android_os_Binder_isHandlingTransaction },

    { "isDirectlyHandlingTransaction", "()Z", (void*)android_os_Binder_isDirectlyHandlingTransaction },

    // @CriticalNative

    { "clearCallingIdentity", "()J", (void*)android_os_Binder_clearCallingIdentity },

    // @CriticalNative
@@ -1088,6 +1088,7 @@ static const JNINativeMethod gBinderMethods[] = { 
    { "getExtension", "()Landroid/os/IBinder;", (void*)android_os_Binder_getExtension },

    { "setExtension", "(Landroid/os/IBinder;)V", (void*)android_os_Binder_setExtension },

};

// clang-format on



const char* const kBinderPathName = "android/os/Binder";