commit b85be43648150015620fcc6bb24eb07433fb4628
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 13 15:29:21 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 13 15:29:21 2018 +0000
tree f04cdbefdea0ffb2c531e00d94e0e57ce5123d1a
parent 809ada2840e4d974172f0a13e7e15f4c2ca78469
parent a16b83c2db2a0ff76a2d313d84c3875c07317d30

Merge "Fix x86 bug with restoreCallingWorkSource"

core/jni/android_util_Binder.cpp

diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp
index 4f8bbc1..3329e20 100644
--- a/core/jni/android_util_Binder.cpp
+++ b/core/jni/android_util_Binder.cpp
@@ -919,7 +919,7 @@
     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

diff --git a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
index d1dbd3c..ef14b00 100644
--- a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
+++ b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
@@ -125,8 +125,10 @@
         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());
     }