From 260d94ed574ac83bf03c080c5d5626582c585b06 Mon Sep 17 00:00:00 2001 From: Aaqib Ismail Date: Thu, 20 Apr 2023 16:37:05 -0700 Subject: [PATCH] Add UNKNOWN fan direction to HVAC_FAN_DIRECTION_AVAILABLE for emulator Bug: 279077869 Test: atest CtsCarTestCases:CarPropertyManagerTest Change-Id: I6f1ccac01d28e630646a0455f53922e3e68483d3 --- .../default_config/JsonConfigLoader/src/JsonConfigLoader.cpp | 1 + .../aidl/impl/default_config/config/DefaultProperties.json | 1 + 2 files changed, 2 insertions(+) diff --git a/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp b/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp index ec0d310508..0a1f90414e 100644 --- a/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp +++ b/automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp @@ -113,6 +113,7 @@ const std::unordered_map CONSTANTS_BY_NAME = { {"WHEEL_FRONT_LEFT", WHEEL_FRONT_LEFT}, {"CHARGE_PORT_FRONT_LEFT", CHARGE_PORT_FRONT_LEFT}, {"CHARGE_PORT_REAR_LEFT", CHARGE_PORT_REAR_LEFT}, + {"FAN_DIRECTION_UNKNOWN", toInt(VehicleHvacFanDirection::UNKNOWN)}, {"FAN_DIRECTION_FLOOR", FAN_DIRECTION_FLOOR}, {"FAN_DIRECTION_FACE", FAN_DIRECTION_FACE}, {"FAN_DIRECTION_DEFROST", FAN_DIRECTION_DEFROST}, diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json index 84edeeda7c..5503de22ec 100644 --- a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json +++ b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json @@ -2164,6 +2164,7 @@ "property": "VehicleProperty::HVAC_FAN_DIRECTION_AVAILABLE", "defaultValue": { "int32Values": [ + "Constants::FAN_DIRECTION_UNKNOWN", "Constants::FAN_DIRECTION_FACE", "Constants::FAN_DIRECTION_FLOOR", "Constants::FAN_DIRECTION_FACE_FLOOR",