commit 7da9d7aa52751434ee869ccd6a1e71d2a9b7f5cd
author keunyoung <keunyoung@google.com> Mon Jun 08 20:08:39 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 08 20:08:49 2015 +0000
tree 1cda4666b84ea3f65aa6f415e3acbd50d24ae0e6
parent 71feb72b76777afa10dca555287f954d63deeb9d
parent 7a542b66e0b27e3202d37989983bb9c71a07455e

Merge "apply force hiding of window only when it is main display" into mnc-dev

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

diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 3305e1e..6dc1183 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -208,7 +208,7 @@
         // Only hide windows if the keyguard is active and not animating away.
         boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded()
                 && mForceHiding != KEYGUARD_ANIMATING_OUT;
-        return keyguardOn && hideWhenLocked;
+        return keyguardOn && hideWhenLocked && (win.getDisplayId() == Display.DEFAULT_DISPLAY);
     }
 
     private void updateWindowsLocked(final int displayId) {