diff options
| author | Craig Mautner <cmautner@google.com> | 2013-10-11 21:43:06 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2013-10-11 21:43:06 -0700 |
| commit | 6f29590e9a1edabb503eb2089dfcf523bfa563e4 (patch) | |
| tree | 4051669e39517339d09e84a1719b00d6b80cd288 /policy/src | |
| parent | 09cb9bdcc8949605e5a26ab50ac73970d1092978 (diff) | |
| download | frameworks_base-6f29590e9a1edabb503eb2089dfcf523bfa563e4.zip frameworks_base-6f29590e9a1edabb503eb2089dfcf523bfa563e4.tar.gz frameworks_base-6f29590e9a1edabb503eb2089dfcf523bfa563e4.tar.bz2 | |
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
Diffstat (limited to 'policy/src')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 448925b..689e3bf 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() { |