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

am: ba836ad1fa Change-Id: I34b0e717f5da0c029a8dd4d9571dc57291ec34c3
2017-04-28 18:15:17 +00:00
parent 7d32c0bd04 ba836ad1fa
commit ed6e67388e
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/KeyguardController.java
+++ b/services/core/java/com/android/server/am/KeyguardController.java
@@ -95,6 +95,7 @@ class KeyguardController {
            return;
        }
        mKeyguardShowing = showing;
+        dismissDockedStackIfNeeded();
        if (showing) {
            mKeyguardGoingAway = false;
            mDismissalRequested = false;