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

* commit '0e823a450a729a753fb8e0618474b6ae3cf3b810': Keyguard isn't visible if it hasn't been drawn.
2013-11-13 15:14:45 -08:00
parent 22bc9f4381 0e823a450a
commit ef1dd26ee7
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowAnimator.java
+++ b/services/java/com/android/server/wm/WindowAnimator.java
@@ -245,7 +245,7 @@ public class WindowAnimator {
                                mForceHiding = KEYGUARD_ANIMATING_OUT;
                            }
                        } else {
-                            mForceHiding = KEYGUARD_SHOWN;
+                            mForceHiding = win.isDrawnLw() ? KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN;
                        }
                    }
                    if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG,