diff options
| author | Aaqib Ismail <aaqibismail@google.com> | 2023-04-25 18:37:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-04-25 18:37:10 +0000 |
| commit | bc591f43565a35847eb18165125068eb6fe79be2 (patch) | |
| tree | 8a9f694221b5f351bc39d27d61eb4286fb1fe8a2 /automotive/vehicle | |
| parent | 6e209a0ec92f406a751e6a6cf237b2271c1a17ff (diff) | |
| parent | 260d94ed574ac83bf03c080c5d5626582c585b06 (diff) | |
| download | interfaces-bc591f43565a35847eb18165125068eb6fe79be2.tar.gz | |
Merge "Add UNKNOWN fan direction to HVAC_FAN_DIRECTION_AVAILABLE for emulator" into udc-dev
Diffstat (limited to 'automotive/vehicle')
| -rw-r--r-- | automotive/vehicle/aidl/impl/default_config/JsonConfigLoader/src/JsonConfigLoader.cpp | 1 | ||||
| -rw-r--r-- | automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json | 1 |
2 files changed, 2 insertions, 0 deletions
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<std::string, int> 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", |