diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-11-02 02:34:15 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-02 02:34:15 -0700 |
| commit | c4b5bf3c7668d3875362bb86af05b3e47937e2ee (patch) | |
| tree | e94ae0a25ef5e413edd3e34c00829d2b618c70c0 /services | |
| parent | a32edd4b4c894f4fb3d9fd7e9d5b80321df79e20 (diff) | |
| parent | 7ab5d2d951792c9b1a1e7cfb279280c2d076506f (diff) | |
| download | frameworks_base-c4b5bf3c7668d3875362bb86af05b3e47937e2ee.zip frameworks_base-c4b5bf3c7668d3875362bb86af05b3e47937e2ee.tar.gz frameworks_base-c4b5bf3c7668d3875362bb86af05b3e47937e2ee.tar.bz2 | |
am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f':
Fix bugs related to cheek event suppression.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PowerManagerService.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index 5cf013f..e9a2ebf 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2219,9 +2219,9 @@ class PowerManagerService extends IPowerManager.Stub int eventType, boolean force) { if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0) - && (eventType == CHEEK_EVENT || eventType == TOUCH_EVENT)) { + && (eventType == CHEEK_EVENT)) { if (false) { - Slog.d(TAG, "dropping cheek or short event mPokey=0x" + Integer.toHexString(mPokey)); + Slog.d(TAG, "dropping cheek event mPokey=0x" + Integer.toHexString(mPokey)); } return; } |