commit 7f4dd5124cd17197c27c80802b4885a9ad23ba90
author Arpit Singh <arpitks@google.com> Thu May 18 13:22:12 2023 +0000
committer Arpit Singh <arpitks@google.com> Wed May 24 09:31:53 2023 +0000
tree 09ee25d7eecb19d0448ac2f8b9048fa4ada3f364
parent 471c5fe0fc93432d4bd55c4b15c4eb3548104e31

InputMapper refactor: Configure empty InputDevice

Configure the Device prior to populating mappers for mappers to
receive correct property map

Test: m checkinput && atest libinput_tests inputflinger_tests
Bug: 256009910

Change-Id: I2a348029afa6c566506f1d79b655173bb8e7a8af

services/inputflinger/tests/InputReader_test.cpp

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