commit f4703da89b220f94b3ed1cf3dd24466e47ba5d85
author Craig Mautner <cmautner@google.com> Wed Nov 13 15:18:47 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 13 15:18:47 2013 -0800
tree 1d790a39f67cde08a5028969344e3bd7f93c097b
parent d5cb5d0fea49491d3f5ff6a757574d7be82dcf50
parent ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5

am ef1dd26e: am 0e823a45: Merge "Keyguard isn\'t visible if it hasn\'t been drawn." into klp-dev

* commit 'ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5':
  Keyguard isn't visible if it hasn't been drawn.

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

diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java
index cd46bb8..91f15f3 100644
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -245,7 +245,7 @@
                                 mForceHiding = KEYGUARD_ANIMATING_OUT;
                             }
                         } else {
-                            mForceHiding = KEYGUARD_SHOWN;
+                            mForceHiding = win.isDrawnLw() ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN;
                         }
                     }
                     if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,