diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-13 15:14:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 15:14:45 -0800 |
| commit | ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5 (patch) | |
| tree | 9752db866a2c729d5b14c236e1e0881f54ead4c9 /services/java | |
| parent | 22bc9f4381e4b058124095abf50209c475c02908 (diff) | |
| parent | 0e823a450a729a753fb8e0618474b6ae3cf3b810 (diff) | |
| download | frameworks_base-ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5.zip frameworks_base-ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5.tar.gz frameworks_base-ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5.tar.bz2 | |
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.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/wm/WindowAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ 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, |