commit 77c68bae6ae8d08d48f7e619383fd277a7badc10
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 01 02:12:25 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 01 02:12:25 2022 +0000
tree 5e477c78f299087ce0263e19218e9dcd10f10834
parent 7ef5badde43119481d0a0b10a54fc14546c3fc8e
parent 0a17df6696f437efd86696360b63020299233924

Merge "Implemented EV_BATTERY_DISPLAY_UNITS" into tm-qpr-dev am: 7079fbd4f4 am: 0a17df6696

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18900589

Change-Id: I2c32f67cbdb17641072edd1db27daa627954845a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h

diff --git a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
index 3a53f18..46b9a89 100644
--- a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
+++ b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
@@ -174,6 +174,17 @@
 
         {.config =
                  {
+                         .prop = toInt(VehicleProperty::EV_BATTERY_DISPLAY_UNITS),
+                         .access = VehiclePropertyAccess::READ_WRITE,
+                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                         .configArray = {toInt(VehicleUnit::WATT_HOUR),
+                                         toInt(VehicleUnit::AMPERE_HOURS),
+                                         toInt(VehicleUnit::KILOWATT_HOUR)},
+                 },
+         .initialValue = {.int32Values = {toInt(VehicleUnit::KILOWATT_HOUR)}}},
+
+        {.config =
+                 {
                          .prop = toInt(VehicleProperty::SEAT_OCCUPANCY),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,