Revert "InputMapper refactor: Revert "fix touch issue on portrai..."
Revert submission 23316821
Reason for revert: breaks touch on some devices b/284203485
Reverted changes: /q/submissionid:23316821
Change-Id: Ic4537a645d710a900d6a3b9328bd6489baedbb1d
diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
index c6b93a5..90ba003 100644
--- a/services/inputflinger/reader/InputDevice.cpp
+++ b/services/inputflinger/reader/InputDevice.cpp
@@ -504,9 +504,9 @@
classes.test(InputDeviceClass::TOUCH_MT) && !isSonyDualShock4Touchpad) {
mappers.push_back(createInputMapper<TouchpadInputMapper>(context, readerConfig));
} else if (classes.test(InputDeviceClass::TOUCH_MT)) {
- mappers.push_back(createInputMapper<MultiTouchInputMapper>(context, readerConfig));
+ mappers.push_back(std::make_unique<MultiTouchInputMapper>(context, readerConfig));
} else if (classes.test(InputDeviceClass::TOUCH)) {
- mappers.push_back(createInputMapper<SingleTouchInputMapper>(context, readerConfig));
+ mappers.push_back(std::make_unique<SingleTouchInputMapper>(context, readerConfig));
}
// Joystick-like devices.