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

Commit 4797d57b authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #6373340: Cannot unlock to app if app was the..."

parents e4cd3b0d 1e88e98d

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

+4 −0
Original line number Diff line number Diff line
@@ -4116,6 +4116,10 @@ public final class ActivityManagerService extends ActivityManagerNative 
    public void dismissKeyguardOnNextActivity() {

        enforceNotIsolatedCaller("dismissKeyguardOnNextActivity");

        synchronized (this) {

            if (mLockScreenShown) {

                mLockScreenShown = false;

                comeOutOfSleepIfNeededLocked();

            }

            mMainStack.dismissKeyguardOnNextActivityLocked();

        }

    }