Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01c7d030 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by The Android Automerger
Browse files

Clear ident in dismissKeyguardOnNextActivity(). 

BaseStatusBar uses this to launch activities over the insecure
lockscreen, so clear identity.

Bug: 6414983
Change-Id: Idf578923285ee1344e6e13e7f51e17a5f2005c75
parent f933bd64

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

+10 −5
Original line number Diff line number Diff line
@@ -4107,6 +4107,8 @@ public final class ActivityManagerService extends ActivityManagerNative 














    public void dismissKeyguardOnNextActivity() {















        enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");













        final long token = Binder.clearCallingIdentity();













        try {















            synchronized (this) {















                if (mLockScreenShown) {















                    mLockScreenShown = false;









@@ -4114,6 +4116,9 @@ public final class ActivityManagerService extends ActivityManagerNative













                }















                mMainStack.dismissKeyguardOnNextActivityLocked();















            }













        } finally {













            Binder.restoreCallingIdentity(token);













        }















    }





























    final void finishBooting() {