commit 2b7fefdc978120a7d2c6db40b20c292234fda53c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Nov 01 20:27:32 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 01 20:27:32 2019 +0000
tree 71dd52ae609949d9e121cc44bf0bbbc2ed5b1dd0
parent 00259c58a2fa84d44562181702d7c77aba91bd06
parent 09638bb7c83ffdc8bec2280725c1d8afeb700782

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

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 a46de24..77053cf 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
@@ -545,6 +545,13 @@
                 .areaConfigs = {VehicleAreaConfig{.areaId = (0)}}},
      .initialValue = {.int32Values = {(int)VehicleUnit::FAHRENHEIT}}},
 
+    {.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),