commit 65e066943e37a017533c7e9d3fcf6227123ba6ed
author Harry Cutts <hcutts@google.com> Thu Mar 09 17:45:46 2023 +0000
committer Harry Cutts <hcutts@google.com> Thu Mar 09 17:45:46 2023 +0000
tree f4edb7b5fb7f02b28db8280d1e475ad61e1c995d
parent 849d782248b8c24fb538c84defc5b5d8f2a48bac

Enable new touchpad stack for Sony DualSense gamepad

Now that b/246587538 is fixed, the touchpad experience on the DualSense
is pretty good. There are still some issues on the DualShock 4, so keep
that on the old stack for now.

Bug: 251196347
Test: connect DualSense gamepad (USB & Bluetooth), check experience is
      smooth
Test: atest inputflinger_tests
Change-Id: I54f822a72161b464d8b5b2cf981200190bb7e709

services/inputflinger/reader/InputDevice.cpp

diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
index 0d2030e..69363b6 100644
--- a/services/inputflinger/reader/InputDevice.cpp
+++ b/services/inputflinger/reader/InputDevice.cpp
@@ -210,14 +210,13 @@
     // Touchscreens and touchpad devices.
     static const bool ENABLE_TOUCHPAD_GESTURES_LIBRARY =
             sysprop::InputProperties::enable_touchpad_gestures_library().value_or(true);
-    // TODO(b/246587538): Fix the new touchpad stack for Sony DualShock 4 (5c4, 9cc) and DualSense
-    // (ce6) touchpads, or at least load this setting from the IDC file.
+    // 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 isSonyGamepadTouchpad = identifier.vendor == 0x054c &&
-            (identifier.product == 0x05c4 || identifier.product == 0x09cc ||
-             identifier.product == 0x0ce6);
+    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) && !isSonyGamepadTouchpad) {
+        classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {
         mappers.push_back(std::make_unique<TouchpadInputMapper>(*contextPtr));
     } else if (classes.test(InputDeviceClass::TOUCH_MT)) {
         mappers.push_back(std::make_unique<MultiTouchInputMapper>(*contextPtr));