Merge "Fix PIP window is showing on the lockscreen (1/2)" into qt-dev am: 031ec27e64

am: 1e05f06908 Change-Id: I935898913dbb031b50230a1e83ca0ac17064d29a
2019-04-25 01:40:00 -07:00
parent cacc9f90a5 1e05f06908
commit b7380d16a1
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -264,7 +264,8 @@ class KeyguardController {
        // Keyguard.
        return dismissKeyguard && canDismissKeyguard() && !mAodShowing
                && (mDismissalRequested
-                || getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r);
+                || (r.canShowWhenLocked()
+                        && getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r));
    }

    /**