Merge "Test for hidden keyguard before waiting for it." into klp-dev

2013-10-12 04:54:42 +00:00
parent 2222a508e7 6f29590e9a
commit 5a7831733b
1 changed files with 1 additions and 1 deletions
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4286,7 +4286,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {

    private void waitForKeyguardWindowDrawn(IBinder windowToken,
            final ScreenOnListener screenOnListener) {
-        if (windowToken != null) {
+        if (windowToken != null && !mHideLockScreen) {
            try {
                if (mWindowManager.waitForWindowDrawn(
                        windowToken, new IRemoteCallback.Stub() {