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/EventHub.cpp

diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp
index d3d8021..3d3a8ea 100644
--- a/services/inputflinger/reader/EventHub.cpp
+++ b/services/inputflinger/reader/EventHub.cpp
@@ -882,14 +882,13 @@
     return device != nullptr ? device->controllerNumber : 0;
 }
 
-void EventHub::getConfiguration(int32_t deviceId, PropertyMap* outConfiguration) const {
+std::optional<PropertyMap> EventHub::getConfiguration(int32_t deviceId) const {
     std::scoped_lock _l(mLock);
     Device* device = getDeviceLocked(deviceId);
-    if (device != nullptr && device->configuration) {
-        *outConfiguration = *device->configuration;
-    } else {
-        outConfiguration->clear();
+    if (device == nullptr || device->configuration == nullptr) {
+        return {};
     }
+    return *device->configuration;
 }
 
 status_t EventHub::getAbsoluteAxisInfo(int32_t deviceId, int axis,