diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-30 14:51:51 -0500 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2009-11-30 14:51:51 -0500 |
| commit | 5db424001254ba1b8b2d1e7f503b02ffca921037 (patch) | |
| tree | 9774ec9321a10fe08e73d6df87a397135b931d22 | |
| parent | f817218e09a556f20efc81309ba2cdb3475a370b (diff) | |
| download | frameworks_base-5db424001254ba1b8b2d1e7f503b02ffca921037.zip frameworks_base-5db424001254ba1b8b2d1e7f503b02ffca921037.tar.gz frameworks_base-5db424001254ba1b8b2d1e7f503b02ffca921037.tar.bz2 | |
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 <lockwood@android.com>
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
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, |