From 6f29590e9a1edabb503eb2089dfcf523bfa563e4 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 11 Oct 2013 21:43:06 -0700 Subject: Test for hidden keyguard before waiting for it. Now that non-null window tokens are coming in in additional situations (ag/372453) we have to look at whether the keyguard is hidden before deciding to wait for it. Fixes bug 1187500. Change-Id: Ie89d5334ab3d0f5b8f2cf8c87fef84a9b6392b72 --- policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 448925bc0533..689e3bf208f4 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4274,7 +4274,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() { -- cgit v1.2.3-59-g8ed1b