commit c34f75882a161847964a186e8f1b3085476018d1
author Harry Cutts <hcutts@google.com> Tue Mar 07 16:23:30 2023 +0000
committer Siarhei Vishniakou <svv@google.com> Wed Mar 08 15:36:51 2023 +0000
tree cb9243a5d06c64da9a3dca961707b42d7ab61db0
parent 7f247abaa9ba0a180a5313bf6b2bac58a98d9adc

Remove InputDeviceContext::getConfiguration(properties)

This API is no longer needed.

Bug: 271251605
Test: atest inputflinger_tests

Change-Id: Ice59fc69c38c27293f085e4a3cd79936f2f3c050

services/inputflinger/reader/InputDevice.cpp

diff --git a/services/inputflinger/reader/InputDevice.cpp b/services/inputflinger/reader/InputDevice.cpp
index 9fe652c..0d2030e 100644
--- a/services/inputflinger/reader/InputDevice.cpp
+++ b/services/inputflinger/reader/InputDevice.cpp
@@ -284,9 +284,11 @@
         if (!changes || (changes & InputReaderConfiguration::CHANGE_DEVICE_TYPE)) {
             mConfiguration.clear();
             for_each_subdevice([this](InputDeviceContext& context) {
-                PropertyMap configuration;
-                context.getConfiguration(&configuration);
-                mConfiguration.addAll(&configuration);
+                std::optional<PropertyMap> configuration =
+                        getEventHub()->getConfiguration(context.getEventHubId());
+                if (configuration) {
+                    mConfiguration.addAll(&(*configuration));
+                }
             });
 
             mAssociatedDeviceType =