Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev

Author: jsharkey

services/java/com/android/server/am/ActivityManagerService.java

@@ -4107,12 +4107,17 @@ public void showBootMessage(final CharSequence msg, final boolean always) {
 
     public void dismissKeyguardOnNextActivity() {
         enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");
-        synchronized (this) {
-            if (mLockScreenShown) {
-                mLockScreenShown = false;
-                comeOutOfSleepIfNeededLocked();
+        final long token = Binder.clearCallingIdentity();
+        try {
+            synchronized (this) {
+                if (mLockScreenShown) {
+                    mLockScreenShown = false;
+                    comeOutOfSleepIfNeededLocked();
+                }
+                mMainStack.dismissKeyguardOnNextActivityLocked();
             }
-            mMainStack.dismissKeyguardOnNextActivityLocked();
+        } finally {
+            Binder.restoreCallingIdentity(token);
         }
     }