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/include/InputDevice.h

diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h
index feb4071..0719b0c 100644
--- a/services/inputflinger/reader/include/InputDevice.h
+++ b/services/inputflinger/reader/include/InputDevice.h
@@ -63,11 +63,8 @@
     inline std::optional<uint8_t> getAssociatedDisplayPort() const {
         return mAssociatedDisplayPort;
     }
-    inline std::optional<std::string> getAssociatedDisplayUniqueIdByPort() const {
-        return mAssociatedDisplayUniqueIdByPort;
-    }
-    inline std::optional<std::string> getAssociatedDisplayUniqueIdByDescriptor() const {
-        return mAssociatedDisplayUniqueIdByDescriptor;
+    inline std::optional<std::string> getAssociatedDisplayUniqueId() const {
+        return mAssociatedDisplayUniqueId;
     }
     inline std::optional<std::string> getDeviceTypeAssociation() const {
         return mAssociatedDeviceType;
@@ -197,8 +194,7 @@
     bool mIsWaking;
     bool mIsExternal;
     std::optional<uint8_t> mAssociatedDisplayPort;
-    std::optional<std::string> mAssociatedDisplayUniqueIdByPort;
-    std::optional<std::string> mAssociatedDisplayUniqueIdByDescriptor;
+    std::optional<std::string> mAssociatedDisplayUniqueId;
     std::optional<std::string> mAssociatedDeviceType;
     std::optional<DisplayViewport> mAssociatedViewport;
     bool mHasMic;
@@ -453,11 +449,8 @@
     inline std::optional<uint8_t> getAssociatedDisplayPort() const {
         return mDevice.getAssociatedDisplayPort();
     }
-    inline std::optional<std::string> getAssociatedDisplayUniqueIdByPort() const {
-        return mDevice.getAssociatedDisplayUniqueIdByPort();
-    }
-    inline std::optional<std::string> getAssociatedDisplayUniqueIdByDescriptor() const {
-        return mDevice.getAssociatedDisplayUniqueIdByDescriptor();
+    inline std::optional<std::string> getAssociatedDisplayUniqueId() const {
+        return mDevice.getAssociatedDisplayUniqueId();
     }
     inline std::optional<std::string> getDeviceTypeAssociation() const {
         return mDevice.getDeviceTypeAssociation();