am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev

* commit '5a7831733be2040fde78027fe2f7eca4f4cc2e28': Test for hidden keyguard before waiting for it.
2013-10-11 21:56:55 -07:00
parent 09abd164e7 5a7831733b
commit 2c1934d302
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() {