Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5111a7db authored by Harry Cutts's avatar Harry Cutts Committed by Android (Google) Code Review
Browse files

Merge changes Ie77cca4e,I13ebfebb into main 

* changes:
  input: use const ref instead of pointer for PropertyMap::addAll
  InputReaderTest: remove unused parameter from addDevice
parents 41e431ce 7cbe9021

include/input/PropertyMap.h

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ public: 
    std::optional<double> getDouble(const std::string& key) const;



    /* Adds all values from the specified property map. */

    void addAll(const PropertyMap* map);

    void addAll(const PropertyMap& map);



    /* Loads a property map from a file. */

    static android::base::Result<std::unique_ptr<PropertyMap>> load(const char* filename);

libs/input/PropertyMap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ std::optional<double> PropertyMap::getDouble(const std::string& key) const { 
    return value;

}



void PropertyMap::addAll(const PropertyMap* map) {

    for (const auto& [key, value] : map->mProperties) {

void PropertyMap::addAll(const PropertyMap& map) {

    for (const auto& [key, value] : map.mProperties) {

        mProperties.emplace(key, value);

    }

}

services/inputflinger/reader/InputDevice.cpp

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ std::list<NotifyArgs> InputDevice::configureInternal(nsecs_t when, 
                std::optional<PropertyMap> configuration =

                        getEventHub()->getConfiguration(context.getEventHubId());

                if (configuration) {

                    mConfiguration.addAll(&(*configuration));

                    mConfiguration.addAll(*configuration);

                }

            });

services/inputflinger/tests/FakeEventHub.cpp

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ void FakeEventHub::addConfigurationProperty(int32_t deviceId, const char* key, c 
    getDevice(deviceId)->configuration.addProperty(key, value);

}



void FakeEventHub::addConfigurationMap(int32_t deviceId, const PropertyMap* configuration) {

    getDevice(deviceId)->configuration.addAll(configuration);

}



void FakeEventHub::addAbsoluteAxis(int32_t deviceId, int axis, int32_t minValue, int32_t maxValue,

                                   int flat, int fuzz, int resolution) {

    Device* device = getDevice(deviceId);

services/inputflinger/tests/FakeEventHub.h

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ public: 
    status_t disableDevice(int32_t deviceId) override;



    void addConfigurationProperty(int32_t deviceId, const char* key, const char* value);

    void addConfigurationMap(int32_t deviceId, const PropertyMap* configuration);



    void addAbsoluteAxis(int32_t deviceId, int axis, int32_t minValue, int32_t maxValue, int flat,

                         int fuzz, int resolution = 0);