commit 3b3d6f896b6bffca88e9f7557b746222dbaf83a7
author Kai Wang <kwangsudo@google.com> Fri Jun 21 23:17:36 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jun 21 23:17:36 2019 -0700
tree b0c38107146394d4c795b54ee08d3e00e01ff47a
parent e8b264f698b070f5acaa8033e84aef291f7ee899
parent 4acdd6621d118e88af7e4f9557c67983625d92c2

Merge "Add Speed_Display_Units property in DefaultHal" into qt-dev am: 130fad824b
am: 4acdd6621d

Change-Id: I345e6b7cce88e877ac65f044e1765f356f514e68

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 39fe991..a46de24 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
@@ -242,6 +242,17 @@
 
     {.config =
          {
+             .prop = toInt(VehicleProperty::VEHICLE_SPEED_DISPLAY_UNITS),
+             .access = VehiclePropertyAccess::READ_WRITE,
+             .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+             .configArray = {(int)VehicleUnit::METER_PER_SEC,
+                             (int)VehicleUnit::MILES_PER_HOUR,
+                             (int)VehicleUnit::KILOMETERS_PER_HOUR},
+         },
+     .initialValue = {.int32Values = {(int)VehicleUnit::KILOMETERS_PER_HOUR}}},
+
+    {.config =
+         {
              .prop = toInt(VehicleProperty::INFO_DRIVER_SEAT),
              .access = VehiclePropertyAccess::READ,
              .changeMode = VehiclePropertyChangeMode::STATIC,