From cf3004a46eabb49f3eee483067e75aef7b0a69e7 Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Mon, 14 Mar 2011 14:24:04 -0700 Subject: [PATCH] Add some debug code to try to track down issue 3183612 java.lang.SecurityException: Neither user 1209 nor current process has android.permission.WAKE_LOCK. Change-Id: I3e84f8795941744e697824a5e5b2e651f565b253 --- core/jni/android_util_Binder.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/core/jni/android_util_Binder.cpp b/core/jni/android_util_Binder.cpp index 7a53874c69835..8db2553e5fc00 100644 --- a/core/jni/android_util_Binder.cpp +++ b/core/jni/android_util_Binder.cpp @@ -603,6 +603,15 @@ static jlong android_os_Binder_clearCallingIdentity(JNIEnv* env, jobject clazz) static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz, jlong token) { + // XXX temporary sanity 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%Lx", token); + jniThrowException(env, "java/lang/IllegalStateException", buf); + return; + } IPCThreadState::self()->restoreCallingIdentity(token); }