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/tests/InputReader_test.cpp b/services/inputflinger/tests/InputReader_test.cpp
index c045e15..bfb371f 100644
--- a/services/inputflinger/tests/InputReader_test.cpp
+++ b/services/inputflinger/tests/InputReader_test.cpp
@@ -2584,10 +2584,7 @@
mFakeEventHub->addDevice(TEST_EVENTHUB_ID, "Test EventHub device", InputDeviceClass::BATTERY);
InputDevice device(mReader->getContext(), /*id=*/1, /*generation=*/2, /*identifier=*/{});
- device.addEmptyEventHubDevice(TEST_EVENTHUB_ID);
- auto unused = device.configure(systemTime(SYSTEM_TIME_MONOTONIC),
- mFakePolicy->getReaderConfiguration(), /*changes=*/{});
- device.populateMappers(TEST_EVENTHUB_ID, mFakePolicy->getReaderConfiguration());
+ device.addEventHubDevice(TEST_EVENTHUB_ID, mFakePolicy->getReaderConfiguration());
device.removeEventHubDevice(TEST_EVENTHUB_ID);
std::string dumpStr, eventHubDevStr;
device.dump(dumpStr, eventHubDevStr);