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

Commit cd2e8105 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 40f9649c 8e3ad786

services/core/jni/com_android_server_input_InputManagerService.cpp

+5 −6
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <utils/Looper.h>

#include <utils/threads.h>

#include <utils/Trace.h>

#include <utils/SortedVector.h>



#include <binder/IServiceManager.h>
@@ -307,7 +306,7 @@ private: 
        wp<PointerController> pointerController;



        // Input devices to be disabled

        SortedVector<int32_t> disabledInputDevices;

        std::set<int32_t> disabledInputDevices;



        // Associated Pointer controller display.

        int32_t pointerDisplayId;
@@ -898,13 +897,13 @@ void NativeInputManager::setInputDeviceEnabled(uint32_t deviceId, bool enabled) 
    { // acquire lock

        AutoMutex _l(mLock);



        ssize_t index = mLocked.disabledInputDevices.indexOf(deviceId);

        bool currentlyEnabled = index < 0;

        auto it = mLocked.disabledInputDevices.find(deviceId);

        bool currentlyEnabled = it == mLocked.disabledInputDevices.end();

        if (!enabled && currentlyEnabled) {

            mLocked.disabledInputDevices.add(deviceId);

            mLocked.disabledInputDevices.insert(deviceId);

        }

        if (enabled && !currentlyEnabled) {

            mLocked.disabledInputDevices.remove(deviceId);

            mLocked.disabledInputDevices.erase(deviceId);

        }

    } // release lock