Let InputReaderContext hold a single PointerController
InputMappers obtain the pointer controller directly from the policy,
which, when we support multiple pointer controller, makes it natural to
have one pointer controller for an input device.
Rather than that, we want to build a system that makes it more natural
to have one pointer per display. To give more control over the
management of pointers, we make it so that InputReaderContext is
responsible for managing the pointer controller.
Bug: 146385350
Test: atest inputflinger_tests
Change-Id: I0b9276ed4a7f55f04f910dd484ecc7f767b8723b
diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index e832804..9cbbf0c 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -756,16 +756,11 @@
mOrientedRanges.clear();
}
- // Create or update pointer controller if needed.
+ // Create pointer controller if needed.
if (mDeviceMode == DEVICE_MODE_POINTER ||
(mDeviceMode == DEVICE_MODE_DIRECT && mConfig.showTouches)) {
- if (mPointerController == nullptr || viewportChanged) {
- mPointerController = getPolicy()->obtainPointerController(getDeviceId());
- // Set the DisplayViewport for the PointerController to the default pointer display
- // that is recommended by the configuration before using it.
- std::optional<DisplayViewport> defaultViewport =
- mConfig.getDisplayViewportById(mConfig.defaultPointerDisplayId);
- mPointerController->setDisplayViewport(defaultViewport.value_or(mViewport));
+ if (mPointerController == nullptr) {
+ mPointerController = getContext()->getPointerController(getDeviceId());
}
} else {
mPointerController.clear();
@@ -3624,12 +3619,6 @@
return changed;
}
-void TouchInputMapper::fadePointer() {
- if (mPointerController != nullptr) {
- mPointerController->fade(PointerControllerInterface::TRANSITION_GRADUAL);
- }
-}
-
void TouchInputMapper::cancelTouch(nsecs_t when) {
abortPointerUsage(when, 0 /*policyFlags*/);
abortTouches(when, 0 /* policyFlags*/);