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

Merge "Fix x86 bug with restoreCallingWorkSource"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-13 15:29:21 +00:00
committed by Android (Google) Code Review
parent 809ada2840 a16b83c2db
commit b85be43648
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_util_Binder.cpp
View File

@@ -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);
}

2
core/tests/coretests/src/android/os/BinderWorkSourceTest.java
View File

@@ -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());
}