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

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

Merge "Revert "fix a weird use of Vector::appendVector()""

parents 3ac60ada b99a8243

services/input/InputDispatcher.cpp

+5 −2
Original line number Diff line number Diff line
@@ -3154,9 +3154,11 @@ void InputDispatcher::setInputWindows(const Vector<InputWindow>& inputWindows) { 
            mLastHoverWindow = NULL;

        }



        mWindows.clear();



        // Loop over new windows and rebuild the necessary window pointers for

        // tracking focus and touch.

        mWindows = inputWindows;

        mWindows.appendVector(inputWindows);



        size_t numWindows = mWindows.size();

        for (size_t i = 0; i < numWindows; i++) {
@@ -4558,7 +4560,8 @@ void InputDispatcher::TouchState::copyFrom(const TouchState& other) { 
    split = other.split;

    deviceId = other.deviceId;

    source = other.source;

    windows = other.windows;

    windows.clear();

    windows.appendVector(other.windows);

}



void InputDispatcher::TouchState::addOrUpdateWindow(const InputWindow* window,