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

Commit 043bd36b authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "Only log dropped input when disabled for the first event." into mnc-dev

parents 47a7dc81 3a981722

services/inputflinger/InputDispatcher.cpp

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




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

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

    mPolicy(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),

    mNextUnblockedEvent(NULL),

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

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

    mInputTargetWaitCause(INPUT_TARGET_WAIT_CAUSE_NONE) {

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

        if (dropReason != DROP_REASON_NOT_DROPPED) {

            dropInboundEventLocked(mPendingEvent, dropReason);

            dropInboundEventLocked(mPendingEvent, dropReason);

        }

        }

        mLastDropReason = dropReason;





        releasePendingEventLocked();

        releasePendingEventLocked();

        *nextWakeupTime = LONG_LONG_MIN;  // force next poll to wake up immediately

        *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";

        reason = "inbound event was dropped because the policy consumed it";

        break;

        break;

    case DROP_REASON_DISABLED:

    case DROP_REASON_DISABLED:

        if (mLastDropReason != DROP_REASON_DISABLED) {

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

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

        }

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

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

        break;

        break;

    case DROP_REASON_APP_SWITCH:

    case DROP_REASON_APP_SWITCH:

services/inputflinger/InputDispatcher.h

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

    Queue<EventEntry> mRecentQueue;

    Queue<CommandEntry> mCommandQueue;

    Queue<CommandEntry> mCommandQueue;





    DropReason mLastDropReason;



    void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime);

    void dispatchOnceInnerLocked(nsecs_t* nextWakeupTime);





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

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