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

Commit ed6e6738 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 (1/2)" into oc-dev 

am: ba836ad1

Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3
parents 7d32c0bd ba836ad1

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

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

        }

        mKeyguardShowing = showing;

        dismissDockedStackIfNeeded();

        if (showing) {

            mKeyguardGoingAway = false;

            mDismissalRequested = false;