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

am: 031ec27e64 Change-Id: I2f231fd2be31bf72b9d317da39d017e42798cd56
2019-04-25 01:23:27 -07:00
parent 104c86afab 031ec27e64
commit 1e05f06908
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));
    }

    /**