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/reader/include/InputDevice.h

diff --git a/services/inputflinger/reader/include/InputDevice.h b/services/inputflinger/reader/include/InputDevice.h
index 0b8a608..1729d46 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 addEventHubDevice(int32_t eventHubId, const InputReaderConfiguration& readerConfig);
+    void populateMappers(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& contextPtr, const InputReaderConfiguration& readerConfig);
+            InputDeviceContext& context, const InputReaderConfiguration& readerConfig);
 
     PropertyMap mConfiguration;