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

Commit f8b99c20 authored by Yu Shan's avatar Yu Shan
Browse files

Allow setting supported values for reference VHAL. 

Debug command in reference VHAL now allows setting supported values
for all properties that specify hasSupportedValuesList to true.

We also introduce a new field "supportedValues" in the fake VHAL
JSON config to allow specifying the initial supported values. If
this field is not specified, we will fallback to use
supportedEnumValues field.

This CL add supportedValues field to HVAC_TEMP_SET and
EV_CHARGE_PERCENT_LIMIT to demonstrate how it may be used.

Flag: EXEMPT VHAL
Test: atest FakeVehicleHardwareTest
Bug: 394692817
Change-Id: I5f602d596360732e2142d691dcce907d6786d7bf
parent 2eeb081e

automotive/vehicle/aidl/impl/current/default_config/JsonConfigLoader/include/ConfigDeclaration.h

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ struct ConfigDeclaration { 
    std::unordered_map<int32_t, aidl::android::hardware::automotive::vehicle::RawPropValues>

            initialAreaValues;



    // The optional supported values for each areaId.

    std::unordered_map<int32_t, std::vector<float>> supportedValuesForAreaId;



    inline bool operator==(const ConfigDeclaration& other) const {

        return (config == other.config && initialValue == other.initialValue &&

                initialAreaValues == other.initialAreaValues);

automotive/vehicle/aidl/impl/current/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp

+7 −0
Original line number Diff line number Diff line
@@ -602,6 +602,13 @@ void JsonConfigParser::parseAreas(const Json::Value& parentJsonNode, const std:: 
            areaConfig.supportedEnumValues = std::move(supportedEnumValues);

        }



        std::vector<float> supportedValues;

        tryParseJsonArrayToVariable(jsonAreaConfig, "supportedValues", /*optional=*/true,

                                    &supportedValues, errors);

        if (!supportedValues.empty()) {

            config->supportedValuesForAreaId[areaId] = std::move(supportedValues);

        }



        if (jsonAreaConfig.isMember("hasSupportedValueInfo")) {

            HasSupportedValueInfo hasSupportedValueInfo = HasSupportedValueInfo{};

            const Json::Value& jsonHasSupportedValueInfo = jsonAreaConfig["hasSupportedValueInfo"];

automotive/vehicle/aidl/impl/current/default_config/config/DefaultProperties.json

+351 −49

File changed.

Preview size limit exceeded, changes collapsed.

automotive/vehicle/aidl/impl/current/default_config/config/TestProperties.json

+6 −1

File changed.

Preview size limit exceeded, changes collapsed.

automotive/vehicle/aidl/impl/current/fake_impl/hardware/include/FakeVehicleHardware.h

+20 −8

File changed.

Preview size limit exceeded, changes collapsed.