From 5db424001254ba1b8b2d1e7f503b02ffca921037 Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Mon, 30 Nov 2009 14:51:51 -0500 Subject: Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected. This fixes another case where the screen would turn on when the keyguard is open but hidden by another activity. Change-Id: I2b7c8a329036401709e96ded4f4c138041192a71 Signed-off-by: Mike Lockwood --- services/java/com/android/server/WindowManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 @@ 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, -- cgit v1.1