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

Commit 7d084bb7 authored by Pin-Yu Huang's avatar Pin-Yu Huang Committed by Android (Google) Code Review
Browse files

Merge "Revert "Use std::set instead of SortedVector""

parents 8ac66cd2 2d8cc894

services/inputflinger/InputReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1094,8 +1094,8 @@ void InputDevice::configure(nsecs_t when, const InputReaderConfiguration* config 
        }



        if (!changes || (changes & InputReaderConfiguration::CHANGE_ENABLED_STATE)) {

            auto it = config->disabledDevices.find(mId);

            bool enabled = it == config->disabledDevices.end();

            ssize_t index = config->disabledDevices.indexOf(mId);

            bool enabled = index < 0;

            setEnabled(enabled, when);

        }

services/inputflinger/include/InputReaderBase.h

+3 −3
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ 
#include <input/VelocityTracker.h>

#include <utils/Thread.h>

#include <utils/RefBase.h>

#include <utils/SortedVector.h>



#include <optional>

#include <stddef.h>

#include <unistd.h>

#include <optional>

#include <set>

#include <unordered_map>

#include <vector>
@@ -249,7 +249,7 @@ struct InputReaderConfiguration { 
    bool pointerCapture;



    // The set of currently disabled input devices.

    std::set<int32_t> disabledDevices;

    SortedVector<int32_t> disabledDevices;



    InputReaderConfiguration() :

            virtualKeyQuietTime(0),

services/inputflinger/tests/InputReader_test.cpp

+14 −2
Original line number Diff line number Diff line
@@ -202,9 +202,21 @@ public: 
        mConfig.portAssociations.insert({inputPort, displayPort});

    }



    void addDisabledDevice(int32_t deviceId) { mConfig.disabledDevices.insert(deviceId); }

    void addDisabledDevice(int32_t deviceId) {

        ssize_t index = mConfig.disabledDevices.indexOf(deviceId);

        bool currentlyEnabled = index < 0;

        if (currentlyEnabled) {

            mConfig.disabledDevices.add(deviceId);

        }

    }



    void removeDisabledDevice(int32_t deviceId) { mConfig.disabledDevices.erase(deviceId); }

    void removeDisabledDevice(int32_t deviceId) {

        ssize_t index = mConfig.disabledDevices.indexOf(deviceId);

        bool currentlyEnabled = index < 0;

        if (!currentlyEnabled) {

            mConfig.disabledDevices.remove(deviceId);

        }

    }



    void setPointerController(int32_t deviceId, const sp<FakePointerController>& controller) {

        mPointerControllers.add(deviceId, controller);