Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2746a1ef authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am abf7fed2: Merge change I2b7c8a32 into eclair 

Merge commit 'abf7fed2' into eclair-plus-aosp

* commit 'abf7fed2':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
parents 624a5b49 abf7fed2

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

+3 −1
Original line number Diff line number Diff line
@@ -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,