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

Merge "Make restoreCallingIdentity() @CriticalNative."

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-20 06:20:57 +00:00
committed by Android (Google) Code Review
parent ab8c0dde6f 4c4ca9a50c
commit 4af480c6c1
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -379,6 +379,7 @@ public class Binder implements IBinder {
*
* @see #clearCallingIdentity
*/
@CriticalNative
public static final native void restoreCallingIdentity(long token);
/**

12
core/jni/android_util_Binder.cpp
View File

@@ -960,17 +960,8 @@ static jlong android_os_Binder_clearCallingIdentity()
return IPCThreadState::self()->clearCallingIdentity();
}
static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz, jlong token)
static void android_os_Binder_restoreCallingIdentity(jlong token)
{
// XXX temporary validation check to debug crashes.
int uid = (int)(token>>32);
if (uid > 0 && uid < 999) {
// In Android currently there are no uids in this range.
char buf[128];
sprintf(buf, "Restoring bad calling ident: 0x%" PRIx64, token);
jniThrowException(env, "java/lang/IllegalStateException", buf);
return;
}
IPCThreadState::self()->restoreCallingIdentity(token);
}
@@ -1064,6 +1055,7 @@ static const JNINativeMethod gBinderMethods[] = {
{ "isHandlingTransaction", "()Z", (void*)android_os_Binder_isHandlingTransaction },
// @CriticalNative
{ "clearCallingIdentity", "()J", (void*)android_os_Binder_clearCallingIdentity },
// @CriticalNative
{ "restoreCallingIdentity", "(J)V", (void*)android_os_Binder_restoreCallingIdentity },
// @CriticalNative
{ "setThreadStrictModePolicy", "(I)V", (void*)android_os_Binder_setThreadStrictModePolicy },