commit cf58b33a7acccd6fa08d4229b85b17eceb850c5b
author Arthur Hung <arthurhung@google.com> Wed Apr 17 16:07:10 2019 +0800
committer Arthur Hung <arthurhung@google.com> Wed Apr 17 08:18:47 2019 +0000
tree b8276002c95195d81300e6ce5fb31a3be40dc87f
parent 30550e1f3edcca22b4e491ea0a9b10687358964b

Fix PIP window is showing on the lockscreen (1/2)

The acivity in pip mode should not be shown in keyguard
even it contains dismiss keyguard window or set shown when locked.

Bug: 130296591
Test: atest KeyguardLockedTests
Change-Id: I72b7d1cb1fc4e4d7d0626e91692ee96d2b6261ec

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));
     }
 
     /**