| commit | ca037668dfb313bf907d0af8afb3cce391363775 | [log] [tgz] |
|---|---|---|
| author | Kai Wang <kwangsudo@google.com> | Wed May 15 19:29:11 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 15 19:29:11 2019 -0700 |
| tree | 2adb119a1682d3155a61dfb7771580055f5e1f80 | |
| parent | 215667e908c2a19c165f7d58cd29058cbecef57f [diff] | |
| parent | 728455da658b28733d9446d92e284555b1ef62e6 [diff] |
Merge "Add configArray for HVAC_TEMPERATURE_DISPLAY_UNITS" into qt-dev am: 728455da65 Change-Id: I2c23441c4a8161bad151d74e9b92d7c14a6c097d
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}}},