commit af76d6d446e14d45f8483f4f0428043f752d1485
author Kai Wang <kwangsudo@google.com> Wed May 15 21:52:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 15 21:52:21 2019 -0700
tree df6e6193c6f678b481855ecc609d86ed66fa8cfe
parent 476f5a8c3755e2346df8081198c6e2c1fac97d50
parent ca037668dfb313bf907d0af8afb3cce391363775

Merge "Add configArray for HVAC_TEMPERATURE_DISPLAY_UNITS" into qt-dev am: 728455da65
am: ca037668df

Change-Id: I089f3790678241998ada78c284b2aa8378fbc643

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
index 08cdffa..39fe991 100644
--- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
+++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h
@@ -530,6 +530,7 @@
     {.config = {.prop = toInt(VehicleProperty::HVAC_TEMPERATURE_DISPLAY_UNITS),
                 .access = VehiclePropertyAccess::READ_WRITE,
                 .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                .configArray = {(int)VehicleUnit::FAHRENHEIT, (int)VehicleUnit::CELSIUS},
                 .areaConfigs = {VehicleAreaConfig{.areaId = (0)}}},
      .initialValue = {.int32Values = {(int)VehicleUnit::FAHRENHEIT}}},