Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use std::set instead of SortedVector

Browse Source 
Avoid the use of custom data structures. Here, convert
disabledInputDevices into set. We only care about whether or not a
certain input device is present in this list.

Bug: 137212522
Test: none
Change-Id: I761a6e0165a7ce937e241c30a40249edd0810376
This commit is contained in:
Siarhei Vishniakou
2019-07-10 15:41:50 -07:00
parent 7507d7bc02
commit 5b38f061dc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -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