commit 8445d195f0b9503568cbe249e5ba98cd6e0a3be0
author Mayank Garg <gargmayank@google.com> Tue May 21 14:31:14 2024 -0700
committer Mayank Garg <gargmayank@google.com> Tue May 21 14:31:14 2024 -0700
tree 7e9395770115afdcfeb06035896248fc07d95649
parent 9679086f2c9187c8f1643e0e385963a95603c2d8

Removed dead code from TouchInputMapper

The view port resolution is already done in Input Device, there is no need to check for mapping again.

Bug: 338665345
Test: atest InputTests
Change-Id: I537b5828ea174eba601bb07f1983cf006baf6bfc

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 8b4b691..62d7841 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -537,18 +537,6 @@
             return getDeviceContext().getAssociatedViewport();
         }
 
-        const std::optional<std::string> associatedDisplayUniqueIdByDescriptor =
-                getDeviceContext().getAssociatedDisplayUniqueIdByDescriptor();
-        if (associatedDisplayUniqueIdByDescriptor) {
-            return getDeviceContext().getAssociatedViewport();
-        }
-
-        const std::optional<std::string> associatedDisplayUniqueIdByPort =
-                getDeviceContext().getAssociatedDisplayUniqueIdByPort();
-        if (associatedDisplayUniqueIdByPort) {
-            return getDeviceContext().getAssociatedViewport();
-        }
-
         if (mDeviceMode == DeviceMode::POINTER) {
             std::optional<DisplayViewport> viewport =
                     mConfig.getDisplayViewportById(mConfig.defaultPointerDisplayId);