From 09638bb7c83ffdc8bec2280725c1d8afeb700782 Mon Sep 17 00:00:00 2001 From: Jordan Jozwiak Date: Thu, 1 Aug 2019 18:48:03 -0700 Subject: [PATCH] DO NOT MERGE Add DISTANCE_DISPLAY_UNIT to google VHAL Bug: 138816759 Test: aae app vhal apply google & dump properties Change-Id: I6a4d571975d5fe7ba6419cd4c37b734f21162f41 (cherry picked from commit 2619443e0a8b5bb8ca19c6c5761c8f6a834e4936) Merged-In: I6a4d571975d5fe7ba6419cd4c37b734f21162f41 --- .../vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 7 +++++++ 1 file changed, 7 insertions(+) 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 a46de24b16..77053cfb60 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 @@ const ConfigDeclaration kVehicleProperties[]{ .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),