summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-11-13 23:11:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-13 23:11:12 +0000
commit0e823a450a729a753fb8e0618474b6ae3cf3b810 (patch)
tree808bf2d549b305588f4be840aa32b91d7e8c875e /services
parentdc0acc6f5d4cc8e4ed6d2a13793030350cd6262d (diff)
parent5c7bd017058ff073b73e96726aa44c4a113f453f (diff)
downloadframeworks_base-0e823a450a729a753fb8e0618474b6ae3cf3b810.zip
frameworks_base-0e823a450a729a753fb8e0618474b6ae3cf3b810.tar.gz
frameworks_base-0e823a450a729a753fb8e0618474b6ae3cf3b810.tar.bz2
Merge "Keyguard isn't visible if it hasn't been drawn." into klp-dev
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/wm/WindowAnimator.java2
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,