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

am 7ab5d2d9: am a87ea46c: Fix bugs related to cheek event suppression.

Browse Source 
* commit '7ab5d2d951792c9b1a1e7cfb279280c2d076506f':
  Fix bugs related to cheek event suppression.
This commit is contained in:
Jeff Brown
2010-11-02 02:34:15 -07:00
committed by Android Git Automerger
parent a32edd4b4c 7ab5d2d951
commit c4b5bf3c76
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ui/InputDispatcher.cpp
View File

@@ -51,8 +51,8 @@
namespace android {
// Delay between reporting long touch events to the power manager.
const nsecs_t EVENT_IGNORE_DURATION = 300 * 1000000LL; // 300 ms
// Delay before reporting long touch events to the power manager.
const nsecs_t LONG_TOUCH_DELAY = 300 * 1000000LL; // 300 ms
// Default input dispatching timeout if there is no focused application or paused window
// from which to determine an appropriate dispatching timeout.
@@ -1424,7 +1424,7 @@ void InputDispatcher::pokeUserActivityLocked(const EventEntry* eventEntry) {
eventType = POWER_MANAGER_TOUCH_UP_EVENT;
break;
default:
if (motionEntry->eventTime - motionEntry->downTime >= EVENT_IGNORE_DURATION) {
if (motionEntry->eventTime - motionEntry->downTime < LONG_TOUCH_DELAY) {
eventType = POWER_MANAGER_TOUCH_EVENT;
} else {
eventType = POWER_MANAGER_LONG_TOUCH_EVENT;

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

@@ -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;
}