commit 031ec27e643707d8380df91101978668e11fa3a3
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 25 07:25:13 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 25 07:25:13 2019 +0000
tree 193e407f5557af465f909bba3617a246f7b2c572
parent bf8aec37d43c950366faff16912c9c8cdd306193
parent cf58b33a7acccd6fa08d4229b85b17eceb850c5b

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

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

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 363db54..df36b09 100644
--- a/services/core/java/com/android/server/wm/KeyguardController.java
+++ b/services/core/java/com/android/server/wm/KeyguardController.java
@@ -264,7 +264,8 @@
         // Keyguard.
         return dismissKeyguard && canDismissKeyguard() && !mAodShowing
                 && (mDismissalRequested
-                || getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r);
+                || (r.canShowWhenLocked()
+                        && getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r));
     }
 
     /**