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

Commit b85be436 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix x86 bug with restoreCallingWorkSource"

parents 809ada28 a16b83c2

core/jni/android_util_Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static jlong android_os_Binder_clearCallingWorkSource() 
    return IPCThreadState::self()->clearCallingWorkSource();

}



static void android_os_Binder_restoreCallingWorkSource(long token)

static void android_os_Binder_restoreCallingWorkSource(jlong token)

{

    IPCThreadState::self()->restoreCallingWorkSource(token);

}

core/tests/coretests/src/android/os/BinderWorkSourceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -125,8 +125,10 @@ public class BinderWorkSourceTest { 
        Binder.setCallingWorkSourceUid(UID);

        long token = Binder.clearCallingWorkSource();

        Binder.restoreCallingWorkSource(token);

        assertEquals(UID, Binder.getCallingWorkSourceUid());



        assertEquals(UID, mService.getIncomingWorkSourceUid());

        // Still the same after the binder transaction.

        assertEquals(UID, Binder.getCallingWorkSourceUid());

    }