Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev

2013-11-13 23:11:12 +00:00
parent dc0acc6f5d 5c7bd01705
commit 0e823a450a
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,