diff options
| author | 2024-03-21 12:30:22 +0000 | |
|---|---|---|
| committer | 2024-03-21 12:30:22 +0000 | |
| commit | ed471732ac76eae4c7eba4dafa4ba26cd7b76e58 (patch) | |
| tree | 41d333b86d751bff6efff973015f3edcba26159f /services/inputflinger/reader | |
| parent | db8c7b40ec0fbb491f5f3ca6b7cc50a7144ee6c0 (diff) | |
| parent | 7577a066e32bbf87bbecc574ce7de75f1848ea91 (diff) | |
Merge "InputDevice: switch Sony DualShock 4 to new touchpad stack" into main
Diffstat (limited to 'services/inputflinger/reader')
| -rw-r--r-- | services/inputflinger/reader/InputDevice.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp index 2baf576903..4d8ffb68bb 100644 --- a/services/inputflinger/reader/InputDevice.cpp +++ b/services/inputflinger/reader/InputDevice.cpp @@ -509,13 +509,8 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers( // Touchscreens and touchpad devices. static const bool ENABLE_TOUCHPAD_GESTURES_LIBRARY = sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true); - // TODO(b/272518665): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) touchpads, or - // at least load this setting from the IDC file. - const InputDeviceIdentifier identifier = contextPtr.getDeviceIdentifier(); - const bool isSonyDualShock4Touchpad = identifier.vendor == 0x054c && - (identifier.product == 0x05c4 || identifier.product == 0x09cc); if (ENABLE_TOUCHPAD_GESTURES_LIBRARY && classes.test(InputDeviceClass::TOUCHPAD) && - classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) { + classes.test(InputDeviceClass::TOUCH_MT)) { mappers.push_back(createInputMapper<TouchpadInputMapper>(contextPtr, readerConfig)); } else if (classes.test(InputDeviceClass::TOUCH_MT)) { mappers.push_back(createInputMapper<MultiTouchInputMapper>(contextPtr, readerConfig)); |