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

Commit 6932dd2c authored by Chen Cheng's avatar Chen Cheng
Browse files

Remove extra commas in DefaultProperties.json. 

The JSON object in DefaultProperties.json is invalid because of extra
commas. Removed these extra commas. And replace some number values
with the original VehicleUnit constants format as in DefaulConfig.h
file.

Test: atest FakeVhalConfigParserUnitTest
Bug: 241959871
Change-Id: Ic5193fa46217f31cfe96f73c6e153631891644bc
parent 144675cf

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

+14 −14
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ 
            "defaultValue": {

                "floatValues": [

                    66.19999694824219,

                    49.0,

                    "VehicleUnit::FAHRENHEIT",

                    19.0,

                    66.5

                ]
@@ -1230,12 +1230,12 @@ 
            "property": "VehicleProperty::HVAC_TEMPERATURE_DISPLAY_UNITS",

            "defaultValue": {

                "int32Values": [

                    49

                    "VehicleUnit::FAHRENHEIT"

                ]

            },

            "configArray": [

                49,

                48

                "VehicleUnit::FAHRENHEIT",

                "VehicleUnit::CELSIUS"

            ]

        },

        {
@@ -1422,22 +1422,22 @@ 
                {

                    "areaId": "Constants::WINDOW_1_LEFT",

                    "minInt32Value": 0,

                    "maxInt32Value": 10,

                    "maxInt32Value": 10

                },

                {

                    "areaId": "Constants::WINDOW_1_RIGHT",

                    "minInt32Value": 0,

                    "maxInt32Value": 10,

                    "maxInt32Value": 10

                },

                {

                    "areaId": "Constants::WINDOW_2_LEFT",

                    "minInt32Value": 0,

                    "maxInt32Value": 10,

                    "maxInt32Value": 10

                },

                {

                    "areaId": "Constants::WINDOW_2_RIGHT",

                    "minInt32Value": 0,

                    "maxInt32Value": 10,

                    "maxInt32Value": 10

                },

                {

                    "areaId": "Constants::WINDOW_ROOF_TOP_1",
@@ -1669,13 +1669,13 @@ 
            "property": "VehicleProperty::CURRENT_POWER_POLICY"

        },

        {

            "property": "VehicleProperty::ANDROID_EPOCH_TIME",

            "property": "VehicleProperty::ANDROID_EPOCH_TIME"

        },

        {

            "property": "VehicleProperty::WATCHDOG_ALIVE",

            "property": "VehicleProperty::WATCHDOG_ALIVE"

        },

        {

            "property": "VehicleProperty::WATCHDOG_TERMINATED_PROCESS",

            "property": "VehicleProperty::WATCHDOG_TERMINATED_PROCESS"

        },

        {

            "property": "VehicleProperty::VHAL_HEARTBEAT"
@@ -1705,7 +1705,7 @@ 
                ]

            },

            "comment":

                    "Value means: 0 /* Off */, -1, -1, -1, -1 /* Bounds */, -1, -1, -1, -1 /* Insets */",

                    "Value means: 0 /* Off */, -1, -1, -1, -1 /* Bounds */, -1, -1, -1, -1 /* Insets */"

        },

        {

            "property": "VehicleProperty::CLUSTER_REPORT_STATE",
@@ -1722,10 +1722,10 @@ 
            ]

        },

        {

            "property": "VehicleProperty::CLUSTER_REQUEST_DISPLAY",

            "property": "VehicleProperty::CLUSTER_REQUEST_DISPLAY"

        },

        {

            "property": "VehicleProperty::CLUSTER_NAVIGATION_STATE",

            "property": "VehicleProperty::CLUSTER_NAVIGATION_STATE"

        },

        {

            "property": "VehicleProperty::GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT",