commit 3138b12f336c8098368d269e6d065a1745a6466f
author Prabir Pradhan <prabirmsp@google.com> Fri Apr 19 17:43:00 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 19 17:43:13 2024 +0000
tree dc23414b11a36319366cbd0446dc0be5fca09b25
parent b12a749ffda2506a981a133a72a7f2a3098c65f0

Revert "Bind an input device via descriptor"

Revert submission 26153841-bind_via_descriptor

Reason for revert: b/335777956
Reverted changes: /q/submissionid:26153841-bind_via_descriptor

Change-Id: I1fd8c73f6700b1992a43e8b2f43d4df4b8f9f05e

services/inputflinger/reader/mapper/TouchInputMapper.cpp

diff --git a/services/inputflinger/reader/mapper/TouchInputMapper.cpp b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
index 82d816c..7d27d4a 100644
--- a/services/inputflinger/reader/mapper/TouchInputMapper.cpp
+++ b/services/inputflinger/reader/mapper/TouchInputMapper.cpp
@@ -536,15 +536,9 @@
             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) {
+        const std::optional<std::string> associatedDisplayUniqueId =
+                getDeviceContext().getAssociatedDisplayUniqueId();
+        if (associatedDisplayUniqueId) {
             return getDeviceContext().getAssociatedViewport();
         }