Clip mWinShowWhenLocked if Keyguard is not showing

Bug: 28076605 Change-Id: I80ae6dbd09d419c258efd79639a62dce8c2fbe79
2016-04-11 19:04:24 -07:00
parent 47ee9ad92c
commit d7f6e7c769
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowStateAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java
@@ -1288,7 +1288,7 @@ class WindowStateAnimator {
        }

        final WindowState winShowWhenLocked = (WindowState) mPolicy.getWinShowWhenLockedLw();
-        if (w == winShowWhenLocked) {
+        if (w == winShowWhenLocked && mPolicy.isKeyguardShowingOrOccluded()) {
            return;
        }