commit 5a7831733be2040fde78027fe2f7eca4f4cc2e28
author Craig Mautner <cmautner@google.com> Sat Oct 12 04:54:42 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 12 04:54:42 2013 +0000
tree 3af970f5749519814ecfd5ea7e441c7581d2359a
parent 2222a508e7a1ae963ac1891c555f9add10e571af
parent 6f29590e9a1edabb503eb2089dfcf523bfa563e4

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

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index ec70314..6dcaddc 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4286,7 +4286,7 @@
 
     private void waitForKeyguardWindowDrawn(IBinder windowToken,
             final ScreenOnListener screenOnListener) {
-        if (windowToken != null) {
+        if (windowToken != null && !mHideLockScreen) {
             try {
                 if (mWindowManager.waitForWindowDrawn(
                         windowToken, new IRemoteCallback.Stub() {