commit b4a584215719c3c2ec27d020654d9e143bc33bc1
author Mike Lockwood <lockwood@android.com> Thu Oct 08 14:31:25 2009 -0400
committer Mike Lockwood <lockwood@android.com> Thu Oct 08 14:32:44 2009 -0400
tree de1021a6c0a8f48c9018139fbb028a769ff8642a
parent e7c8c7c1a49c05fcb075c362c67ac61f7dfdbed5

Ignore requests to hide the keyguard if we are in the process of waking up.

This should fix a race condition that results in the screen waking up
and displaying nothing but wall paper

Bug b/2168660

Change-Id: I55bac0aaab8425cde282e7fc7e7c6b82217fbc9d
Signed-off-by: Mike Lockwood <lockwood@android.com>

policy/com/android/internal/policy/impl/KeyguardViewMediator.java

diff --git a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
index 34b5e3a..dc243c4 100644
--- a/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
+++ b/policy/com/android/internal/policy/impl/KeyguardViewMediator.java
@@ -876,6 +876,10 @@
     private void handleHide() {
         synchronized (KeyguardViewMediator.this) {
             if (DEBUG) Log.d(TAG, "handleHide");
+            if (mWakeAndHandOff.isHeld()) {
+                Log.w(TAG, "attempt to hide the keyguard while waking, ignored");
+                return;
+            }
             // When we go away, tell the poewr manager to honor requests from userActivity.
             mRealPowerManager.enableUserActivity(true);