commit 5ff78c13993c060f260c0dba7cef881ddea35321
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 01 18:55:02 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 01 18:55:02 2019 +0000
tree c431c959a7a55b9ea86f85227cf8dc3cc6a6ac7d
parent b64ab1daa471f66c4ae93d0c541c86e78337ca05
parent 88213e319332ec5063e32db97a8f2f8f466cd268

Merge "DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL" into qt-qpr1-dev-plus-aosp

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 2c5e5cc..8a89322 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
@@ -570,6 +570,16 @@
 
         {.config =
                  {
+                         .prop = toInt(VehicleProperty::DISTANCE_DISPLAY_UNITS),
+                         .access = VehiclePropertyAccess::READ_WRITE,
+                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                         .configArray = {(int)VehicleUnit::KILOMETER, (int)VehicleUnit::MILE},
+                         .areaConfigs = {VehicleAreaConfig{.areaId = (0)}}
+                 },
+         .initialValue = {.int32Values = {(int)VehicleUnit::MILE}}},
+
+        {.config =
+                 {
                          .prop = toInt(VehicleProperty::NIGHT_MODE),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,