From cf58b33a7acccd6fa08d4229b85b17eceb850c5b Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Wed, 17 Apr 2019 16:07:10 +0800
Subject: [PATCH] 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
---
 .../core/java/com/android/server/wm/KeyguardController.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java
index 363db5439f276..df36b09d56e8d 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 @@ class KeyguardController {
         // Keyguard.
         return dismissKeyguard && canDismissKeyguard() && !mAodShowing
                 && (mDismissalRequested
-                || getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r);
+                || (r.canShowWhenLocked()
+                        && getDisplay(r.getDisplayId()).mDismissingKeyguardActivity != r));
     }
 
     /**