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

Commit 8eaf10e0 authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard... 

Merge "Dismiss docked stack when ShowWhenLocked activity is over keyguard (1/2)" into oc-dev am: ba836ad1
am: ed6e6738

Change-Id: Iaad787457b787dbbdc984aaf7009895c4c6d3091
parents 5cf54947 ed6e6738

services/core/java/com/android/server/am/KeyguardController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -95,6 +95,7 @@ class KeyguardController { 
            return;

            return;

        }

        }

        mKeyguardShowing = showing;

        mKeyguardShowing = showing;

        dismissDockedStackIfNeeded();

        if (showing) {

        if (showing) {

            mKeyguardGoingAway = false;

            mKeyguardGoingAway = false;

            mDismissalRequested = false;

            mDismissalRequested = false;