commit abf7fed21bfa7eb899be558477d928a7c9f3e1f6
author Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 16:39:53 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 30 16:39:53 2009 -0800
tree 6279d2fd3b015a721396bf771d31969fb8c88891
parent 90aaaef5f97ee885cc5898f3e7517ad4e5943d2f
parent 5db424001254ba1b8b2d1e7f503b02ffca921037

Merge change I2b7c8a32 into eclair

* changes:
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.

services/java/com/android/server/WindowManagerService.java

diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java
index b4db7bc..44c9f0f 100644
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -6397,7 +6397,9 @@
                             // Ignore
                         }
 
-                        if (eventType != TOUCH_EVENT
+                        if (ev.classType == RawInputEvent.CLASS_CONFIGURATION_CHANGED) {
+                            // do not wake screen in this case
+                        } else if (eventType != TOUCH_EVENT
                                 && eventType != LONG_TOUCH_EVENT
                                 && eventType != CHEEK_EVENT) {
                             mPowerManager.userActivity(curTime, false,