commit 69f1479abe1f53a05504502c08b2877659ddab94
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jun 08 16:45:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 08 16:45:50 2020 +0000
tree b11c811d1a57e1bbb97ba42985cc2fe3c704371b
parent 9a23df27d581e8fa8d88dc7748c0fccfa88c415f
parent c6d9967e8915cde4b2b2c6feda0d9f30119af133

Merge "TouchInputMapper: Use default viewport for PointerController"

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index b0711c7..fb35bee 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -771,7 +771,11 @@
         (mDeviceMode == DEVICE_MODE_DIRECT && mConfig.showTouches)) {
         if (mPointerController == nullptr || viewportChanged) {
             mPointerController = getPolicy()->obtainPointerController(getDeviceId());
-            mPointerController->setDisplayViewport(mViewport);
+            // 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));
         }
     } else {
         mPointerController.clear();