Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am abf7fed2: Merge change I2b7c8a32 into eclair

Browse Source 
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-mr2

* commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6':
  Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
This commit is contained in:
Mike Lockwood
2009-12-01 18:30:12 -08:00
committed by Android Git Automerger
parent a8c79a8c65 abf7fed21b
commit c1bb46e9d5
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/WindowManagerService.java
View File

@@ -6397,7 +6397,9 @@ public class WindowManagerService extends IWindowManager.Stub
// Ignore // 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 != LONG_TOUCH_EVENT
&& eventType != CHEEK_EVENT) { && eventType != CHEEK_EVENT) {
mPowerManager.userActivity(curTime, false, mPowerManager.userActivity(curTime, false,