summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-11-01 21:02:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-01 21:02:05 -0700
commit7ab5d2d951792c9b1a1e7cfb279280c2d076506f (patch)
tree51056ccc3a744e0ef6266c420086f16999509c01 /services
parent424963ef8d46c34d67ea24d25735944c0d87409c (diff)
parenta87ea46cb023763e0a9b0222da20b0a354f79d8d (diff)
downloadframeworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.zip
frameworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.tar.gz
frameworks_base-7ab5d2d951792c9b1a1e7cfb279280c2d076506f.tar.bz2
am a87ea46c: Fix bugs related to cheek event suppression.
* commit 'a87ea46cb023763e0a9b0222da20b0a354f79d8d': Fix bugs related to cheek event suppression.
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PowerManagerService.java4
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 b0e30f9..a6daaef 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -2213,9 +2213,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;
}