From 1983a71e2a29934ec3a7c8a0fb20e0ced0ad44dc Mon Sep 17 00:00:00 2001 From: Siarhei Vishniakou Date: Fri, 4 Jun 2021 19:27:09 +0000 Subject: Return a copy of InputDeviceLightInfo instead of pointer Refactor InputReaderInterface to return a copy instead of pointer. This will ensure that we don't read from memory that's been freed. Also, refactor InputDevice api's to return a list of infos instead of having to query each individually. In all usages so far, there's no need to get a specific info by type. Bug: 190126442 Test: atest inputflinger_tests libinput_tests Change-Id: I7f993a14259bb802e2631663c1c8bb65cc9b6702 --- include/input/InputDevice.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/input/InputDevice.h b/include/input/InputDevice.h index 1fec08027f..7f0324a4a8 100644 --- a/include/input/InputDevice.h +++ b/include/input/InputDevice.h @@ -257,13 +257,9 @@ public: return mMotionRanges; } - const InputDeviceSensorInfo* getSensorInfo(InputDeviceSensorType type); + std::vector getSensors(); - const std::vector getSensorTypes(); - - const std::vector getLightIds(); - - const InputDeviceLightInfo* getLightInfo(int32_t id); + std::vector getLights(); private: int32_t mId; -- cgit v1.2.3-59-g8ed1b