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

Commit 2749668e authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Exorcise notification panel ghosts. Bug: 5105599"

parents 64e35bb0 8bcbbefa

services/input/InputReader.cpp

+4 −8
Original line number Diff line number Diff line
@@ -1335,7 +1335,7 @@ void MultiTouchMotionAccumulator::configure(size_t slotCount, bool usingSlotsPro 


void MultiTouchMotionAccumulator::clearSlots(int32_t initialSlot) {

    for (size_t i = 0; i < mSlotCount; i++) {

        mSlots[i].clearIfInUse();

        mSlots[i].clear();

    }

    mCurrentSlot = initialSlot;

}
@@ -1396,7 +1396,9 @@ void MultiTouchMotionAccumulator::process(const RawEvent* rawEvent) { 
                break;

            case ABS_MT_TRACKING_ID:

                if (mUsingSlotsProtocol && rawEvent->value < 0) {

                    slot->clearIfInUse();

                    // The slot is no longer in use but it retains its previous contents,

                    // which may be reused for subsequent touches.

                    slot->mInUse = false;

                } else {

                    slot->mInUse = true;

                    slot->mAbsMTTrackingId = rawEvent->value;
@@ -1430,12 +1432,6 @@ MultiTouchMotionAccumulator::Slot::Slot() { 
    clear();

}



void MultiTouchMotionAccumulator::Slot::clearIfInUse() {

    if (mInUse) {

        clear();

    }

}



void MultiTouchMotionAccumulator::Slot::clear() {

    mInUse = false;

    mHaveAbsMTTouchMinor = false;

services/input/InputReader.h

+0 −1
Original line number Diff line number Diff line
@@ -696,7 +696,6 @@ public: 
        int32_t mAbsMTToolType;



        Slot();

        void clearIfInUse();

        void clear();

    };