Revert "InputMapper refactor: Configure empty InputDevice"
Revert submission 23316821
Reason for revert: breaks touch on some devices b/284203485
Reverted changes: /q/submissionid:23316821
Change-Id: Id957e51b53e48b874302b24b612554f3024aa87b
diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h
index 1729d46..0b8a608 100644
--- a/services/inputflinger/reader/include/InputDevice.h
+++ b/services/inputflinger/reader/include/InputDevice.h
@@ -81,7 +81,7 @@
void dump(std::string& dump, const std::string& eventHubDevStr);
void addEmptyEventHubDevice(int32_t eventHubId);
- void populateMappers(int32_t eventHubId, const InputReaderConfiguration& readerConfig);
+ void addEventHubDevice(int32_t eventHubId, const InputReaderConfiguration& readerConfig);
void removeEventHubDevice(int32_t eventHubId);
[[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,
const InputReaderConfiguration& readerConfig,
@@ -203,7 +203,7 @@
int32_t getState(uint32_t sourceMask, int32_t code, GetStateFunc getStateFunc);
std::vector<std::unique_ptr<InputMapper>> createMappers(
- InputDeviceContext& context, const InputReaderConfiguration& readerConfig);
+ InputDeviceContext& contextPtr, const InputReaderConfiguration& readerConfig);
PropertyMap mConfiguration;