commit fe2bddfae1b8c2375f58216871d923cbfe267dd3
author Dianne Hackborn <hackbod@google.com> Sun Sep 20 15:21:10 2009 -0700
committer Dianne Hackborn <hackbod@google.com> Mon Sep 21 17:39:15 2009 -0700
tree f0a88c4b8f2ce295608f56673eb786d8c31922f5
parent 7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce

Don't wake up the screen as soon as the lid opens.

We may need to wait until the lock screen is ready.

Change-Id: Id114f4f37051680ab880056b4c989b1fa8aa02b3

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 656d6ba..9d2fc27 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1862,9 +1862,10 @@
                 Log.d(TAG, "setKeyboardVisibility: " + visible);
             }
             mKeyboardVisible = visible;
-            // don't signal user activity when closing keyboard if the screen is off.
-            // otherwise, we want to make sure the backlights are adjusted.
-            if (visible || (mPowerState & SCREEN_ON_BIT) != 0) {
+            // don't signal user activity if the screen is off; other code
+            // will take care of turning on due to a true change to the lid
+            // switch and synchronized with the lock screen.
+            if ((mPowerState & SCREEN_ON_BIT) != 0) {
                 userActivity(SystemClock.uptimeMillis(), false, BUTTON_EVENT, true);
             }
         }