Merge "Add UNKNOWN fan direction to HVAC_FAN_DIRECTION_AVAILABLE for emulator" into udc-dev am: bc591f4356
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22777025
Change-Id: I272a3bf3403265671bb078fb676b227ba018c91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 ec0d310..0a1f904 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 @@
{"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 84edeed..5503de2 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",