Revert behavior of loading the AssociatedDevice
ag/19714571 changed the behavior of loading AssociatedDevices so that it
was only read once for each sysfsPath, even if multiple event hub
devices had the same sysfs path.
However, that caused CTS hardware tests that read battery info to be
flaky. To mitigate this, we revert to the previous behavior of
re-loading the AssociatedDevice for each event hub device for now, until
we can debug the source of this issue.
Bug: 243979881
Test: atest SonyDualshock4BluetoothTest#testBattery --iterations 100
Change-Id: If7ab1076f0528945cf75073986ad0397471533ca
diff --git a/services/inputflinger/reader/include/EventHub.h b/services/inputflinger/reader/include/EventHub.h
index 6b8cc25..ceae10d 100644
--- a/services/inputflinger/reader/include/EventHub.h
+++ b/services/inputflinger/reader/include/EventHub.h
@@ -195,6 +195,9 @@
ftl::Flags<InputLightClass> flags;
std::array<int32_t, COLOR_NUM> rgbIndex;
std::filesystem::path path;
+
+ bool operator==(const RawLightInfo&) const = default;
+ bool operator!=(const RawLightInfo&) const = default;
};
/* Describes a raw battery. */
@@ -203,6 +206,9 @@
std::string name;
ftl::Flags<InputBatteryClass> flags;
std::filesystem::path path;
+
+ bool operator==(const RawBatteryInfo&) const = default;
+ bool operator!=(const RawBatteryInfo&) const = default;
};
/*
@@ -551,6 +557,10 @@
hardware::input::InputDeviceCountryCode countryCode;
std::unordered_map<int32_t /*batteryId*/, RawBatteryInfo> batteryInfos;
std::unordered_map<int32_t /*lightId*/, RawLightInfo> lightInfos;
+
+ bool operator==(const AssociatedDevice&) const = default;
+ bool operator!=(const AssociatedDevice&) const = default;
+ std::string dump() const;
};
struct Device {
@@ -584,7 +594,7 @@
// A shared_ptr of a device associated with the input device.
// The input devices that have the same sysfs path have the same associated device.
- const std::shared_ptr<const AssociatedDevice> associatedDevice;
+ std::shared_ptr<const AssociatedDevice> associatedDevice;
int32_t controllerNumber;