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

Commit 5600bff7 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 2fea92e6: Merge "Clear ident in dismissKeyguardOnNextActivity()." into jb-dev 

* commit '2fea92e6':
  Clear ident in dismissKeyguardOnNextActivity().
parents 4abe9ccb 2fea92e6

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() {