diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-11-30 16:47:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-30 16:47:18 -0800 |
| commit | 2746a1efb1740f6f2d1965320eb99f935f5fae2c (patch) | |
| tree | 4edcad666020054cbcb15cb496e5257dc1e6af89 /services/java | |
| parent | 624a5b49848ffbb94206304a7ae6e62c8739613c (diff) | |
| parent | abf7fed21bfa7eb899be558477d928a7c9f3e1f6 (diff) | |
| download | frameworks_base-2746a1efb1740f6f2d1965320eb99f935f5fae2c.zip frameworks_base-2746a1efb1740f6f2d1965320eb99f935f5fae2c.tar.gz frameworks_base-2746a1efb1740f6f2d1965320eb99f935f5fae2c.tar.bz2 | |
am abf7fed2: Merge change I2b7c8a32 into eclair
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp
* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Diffstat (limited to 'services/java')
| -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, |