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

am c1bb46e9: am abf7fed2: Merge change I2b7c8a32 into eclair

Browse Source 
Merge commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2' into eclair-mr2-plus-aosp

* commit 'c1bb46e9d58f05449d8420c81f5cae06e1084ac2':
  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:42:55 -08:00
committed by Android Git Automerger
parent 57928702bf c1bb46e9d5
commit 8fcb312f6c
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
}
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,