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

Commit a393c62f authored by Michael Wright's avatar Michael Wright Committed by Android Git Automerger
Browse files

am f8b34319: am 043bd36b: Merge "Only log dropped input when disabled for the... 

am f8b34319: am 043bd36b: Merge "Only log dropped input when disabled for the first event." into mnc-dev

* commit 'f8b34319':
  Only log dropped input when disabled for the first event.
parents 82cdd76e f8b34319

services/inputflinger/InputDispatcher.cpp

+6 −2
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ static void dumpRegion(String8& dump, const Region& region) { 


InputDispatcher::InputDispatcher(const sp<InputDispatcherPolicyInterface>& policy) :

    mPolicy(policy),

    mPendingEvent(NULL), mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX),

    mPendingEvent(NULL), mLastDropReason(DROP_REASON_NOT_DROPPED),

    mAppSwitchSawKeyDown(false), mAppSwitchDueTime(LONG_LONG_MAX),

    mNextUnblockedEvent(NULL),

    mDispatchEnabled(false), mDispatchFrozen(false), mInputFilterEnabled(false),

    mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {
@@ -397,6 +398,7 @@ void InputDispatcher::dispatchOnceInnerLocked(nsecs_t* nextWakeupTime) { 
        if (dropReason != DROP_REASON_NOT_DROPPED) {

            dropInboundEventLocked(mPendingEvent, dropReason);

        }

        mLastDropReason = dropReason;



        releasePendingEventLocked();

        *nextWakeupTime = LONG_LONG_MIN;  // force next poll to wake up immediately
@@ -506,7 +508,9 @@ void InputDispatcher::dropInboundEventLocked(EventEntry* entry, DropReason dropR 
        reason = "inbound event was dropped because the policy consumed it";

        break;

    case DROP_REASON_DISABLED:

        if (mLastDropReason != DROP_REASON_DISABLED) {

            ALOGI("Dropped event because input dispatch is disabled.");

        }

        reason = "inbound event was dropped because input dispatch is disabled";

        break;

    case DROP_REASON_APP_SWITCH:

services/inputflinger/InputDispatcher.h

+2 −0
Original line number Diff line number Diff line
@@ -857,6 +857,8 @@ private: 
    Queue<EventEntry> mRecentQueue;

    Queue<CommandEntry> mCommandQueue;



    DropReason mLastDropReason;



    void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime);



    // Enqueues an inbound event.  Returns true if mLooper->wake() should be called.