Merge change I2b7c8a32 into eclair

* changes: Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
2009-11-30 16:39:53 -08:00
parent 90aaaef5f9 5db4240012
commit abf7fed21b
1 changed files with 3 additions and 1 deletions
--- a/services/java/com/android/server/WindowManagerService.java
+++ b/services/java/com/android/server/WindowManagerService.java
@@ -6397,7 +6397,9 @@ public class WindowManagerService extends IWindowManager.Stub
                            // 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,