Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ab5d2d9 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am a87ea46c: Fix bugs related to cheek event suppression. 

* commit 'a87ea46c':
  Fix bugs related to cheek event suppression.
parents 424963ef a87ea46c

libs/ui/InputDispatcher.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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.
@@ -1416,7 +1416,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;

services/java/com/android/server/PowerManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

        }