diff options
| author | Craig Mautner <cmautner@google.com> | 2013-11-13 15:18:47 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-13 15:18:47 -0800 |
| commit | f4703da89b220f94b3ed1cf3dd24466e47ba5d85 (patch) | |
| tree | 1d790a39f67cde08a5028969344e3bd7f93c097b /services/java | |
| parent | d5cb5d0fea49491d3f5ff6a757574d7be82dcf50 (diff) | |
| parent | ef1dd26ee7b4d8a6ec854bd0b5b9557d67b554f5 (diff) | |
| download | frameworks_base-f4703da89b220f94b3ed1cf3dd24466e47ba5d85.zip frameworks_base-f4703da89b220f94b3ed1cf3dd24466e47ba5d85.tar.gz frameworks_base-f4703da89b220f94b3ed1cf3dd24466e47ba5d85.tar.bz2 | |
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.
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, |