diff options
| author | 2019-02-08 02:13:01 +0000 | |
|---|---|---|
| committer | 2019-02-08 02:13:01 +0000 | |
| commit | 84a7e453bd7dd852a304d75eb689364e100cf43c (patch) | |
| tree | d669d5aa6116146f0da51d93779bedee8fdca46d /services/inputflinger/EventHub.cpp | |
| parent | 3628627257db1c00647e151a7806ab66004cefe8 (diff) | |
| parent | cae4b3ae7e92ee6243dbed83ff2ffcf2c7a78915 (diff) | |
Merge "Remove EventHub header from include dir"
Diffstat (limited to 'services/inputflinger/EventHub.cpp')
| -rw-r--r-- | services/inputflinger/EventHub.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp index cf9d3c7aa5..c13bac6a12 100644 --- a/services/inputflinger/EventHub.cpp +++ b/services/inputflinger/EventHub.cpp @@ -763,7 +763,7 @@ EventHub::Device* EventHub::getDeviceByDescriptorLocked(const std::string& descr } EventHub::Device* EventHub::getDeviceLocked(int32_t deviceId) const { - if (deviceId == BUILT_IN_KEYBOARD_ID) { + if (deviceId == ReservedInputDeviceId::BUILT_IN_KEYBOARD_ID) { deviceId = mBuiltInKeyboardId; } ssize_t index = mDevices.indexOfKey(deviceId); @@ -835,7 +835,8 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz device->id, device->path.c_str()); mClosingDevices = device->next; event->when = now; - event->deviceId = device->id == mBuiltInKeyboardId ? BUILT_IN_KEYBOARD_ID : device->id; + event->deviceId = (device->id == mBuiltInKeyboardId) ? + ReservedInputDeviceId::BUILT_IN_KEYBOARD_ID : device->id; event->type = DEVICE_REMOVED; event += 1; delete device; @@ -1081,7 +1082,7 @@ void EventHub::scanDevicesLocked() { ALOGE("scan video dir failed for %s", VIDEO_DEVICE_PATH); } } - if (mDevices.indexOfKey(VIRTUAL_KEYBOARD_ID) < 0) { + if (mDevices.indexOfKey(ReservedInputDeviceId::VIRTUAL_KEYBOARD_ID) < 0) { createVirtualKeyboardLocked(); } } @@ -1580,7 +1581,8 @@ void EventHub::createVirtualKeyboardLocked() { identifier.uniqueId = "<virtual>"; assignDescriptorLocked(identifier); - Device* device = new Device(-1, VIRTUAL_KEYBOARD_ID, "<virtual>", identifier); + Device* device = new Device(-1, ReservedInputDeviceId::VIRTUAL_KEYBOARD_ID, "<virtual>", + identifier); device->classes = INPUT_DEVICE_CLASS_KEYBOARD | INPUT_DEVICE_CLASS_ALPHAKEY | INPUT_DEVICE_CLASS_DPAD |