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
diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
index 933c502..782c84a 100644
--- a/services/inputflinger/reader/InputDevice.cpp
+++ b/services/inputflinger/reader/InputDevice.cpp
@@ -77,11 +77,11 @@
// If a device is associated with a specific display but there is no
// associated DisplayViewport, don't enable the device.
- if (enable && (mAssociatedDisplayPort || mAssociatedDisplayUniqueIdByPort) &&
+ if (enable && (mAssociatedDisplayPort || mAssociatedDisplayUniqueId) &&
!mAssociatedViewport) {
const std::string desc = mAssociatedDisplayPort
? "port " + std::to_string(*mAssociatedDisplayPort)
- : "uniqueId " + *mAssociatedDisplayUniqueIdByPort;
+ : "uniqueId " + *mAssociatedDisplayUniqueId;
ALOGW("Cannot enable input device %s because it is associated "
"with %s, but the corresponding viewport is not found",
getName().c_str(), desc.c_str());
@@ -124,15 +124,9 @@
} else {
dump += "<none>\n";
}
- dump += StringPrintf(INDENT2 "AssociatedDisplayUniqueIdByPort: ");
- if (mAssociatedDisplayUniqueIdByPort) {
- dump += StringPrintf("%s\n", mAssociatedDisplayUniqueIdByPort->c_str());
- } else {
- dump += "<none>\n";
- }
- dump += StringPrintf(INDENT2 "AssociatedDisplayUniqueIdByDescriptor: ");
- if (mAssociatedDisplayUniqueIdByDescriptor) {
- dump += StringPrintf("%s\n", mAssociatedDisplayUniqueIdByDescriptor->c_str());
+ dump += StringPrintf(INDENT2 "AssociatedDisplayUniqueId: ");
+ if (mAssociatedDisplayUniqueId) {
+ dump += StringPrintf("%s\n", mAssociatedDisplayUniqueId->c_str());
} else {
dump += "<none>\n";
}
@@ -275,28 +269,8 @@
// In most situations, no port or name will be specified.
mAssociatedDisplayPort = std::nullopt;
- mAssociatedDisplayUniqueIdByPort = std::nullopt;
+ mAssociatedDisplayUniqueId = std::nullopt;
mAssociatedViewport = std::nullopt;
- // Find the display port that corresponds to the current input device descriptor
- const std::string& inputDeviceDescriptor = mIdentifier.descriptor;
- if (!inputDeviceDescriptor.empty()) {
- const std::unordered_map<std::string, uint8_t>& ports =
- readerConfig.portAssociations;
- const auto& displayPort = ports.find(inputDeviceDescriptor);
- if (displayPort != ports.end()) {
- mAssociatedDisplayPort = std::make_optional(displayPort->second);
- } else {
- const std::unordered_map<std::string, std::string>&
- displayUniqueIdsByDescriptor =
- readerConfig.uniqueIdAssociationsByDescriptor;
- const auto& displayUniqueIdByDescriptor =
- displayUniqueIdsByDescriptor.find(inputDeviceDescriptor);
- if (displayUniqueIdByDescriptor != displayUniqueIdsByDescriptor.end()) {
- mAssociatedDisplayUniqueIdByDescriptor =
- displayUniqueIdByDescriptor->second;
- }
- }
- }
// Find the display port that corresponds to the current input port.
const std::string& inputPort = mIdentifier.location;
if (!inputPort.empty()) {
@@ -306,11 +280,11 @@
if (displayPort != ports.end()) {
mAssociatedDisplayPort = std::make_optional(displayPort->second);
} else {
- const std::unordered_map<std::string, std::string>& displayUniqueIdsByPort =
- readerConfig.uniqueIdAssociationsByPort;
- const auto& displayUniqueIdByPort = displayUniqueIdsByPort.find(inputPort);
- if (displayUniqueIdByPort != displayUniqueIdsByPort.end()) {
- mAssociatedDisplayUniqueIdByPort = displayUniqueIdByPort->second;
+ const std::unordered_map<std::string, std::string>& displayUniqueIds =
+ readerConfig.uniqueIdAssociations;
+ const auto& displayUniqueId = displayUniqueIds.find(inputPort);
+ if (displayUniqueId != displayUniqueIds.end()) {
+ mAssociatedDisplayUniqueId = displayUniqueId->second;
}
}
}
@@ -325,21 +299,13 @@
"but the corresponding viewport is not found.",
getName().c_str(), *mAssociatedDisplayPort);
}
- } else if (mAssociatedDisplayUniqueIdByDescriptor != std::nullopt) {
- mAssociatedViewport = readerConfig.getDisplayViewportByUniqueId(
- *mAssociatedDisplayUniqueIdByDescriptor);
+ } else if (mAssociatedDisplayUniqueId != std::nullopt) {
+ mAssociatedViewport =
+ readerConfig.getDisplayViewportByUniqueId(*mAssociatedDisplayUniqueId);
if (!mAssociatedViewport) {
ALOGW("Input device %s should be associated with display %s but the "
"corresponding viewport cannot be found",
- getName().c_str(), mAssociatedDisplayUniqueIdByDescriptor->c_str());
- }
- } else if (mAssociatedDisplayUniqueIdByPort != std::nullopt) {
- mAssociatedViewport = readerConfig.getDisplayViewportByUniqueId(
- *mAssociatedDisplayUniqueIdByPort);
- if (!mAssociatedViewport) {
- ALOGW("Input device %s should be associated with display %s but the "
- "corresponding viewport cannot be found",
- getName().c_str(), mAssociatedDisplayUniqueIdByPort->c_str());
+ getName().c_str(), mAssociatedDisplayUniqueId->c_str());
}
}