commit a1bba29abe07179392efa7c7f3a6944f40ede75e
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jul 01 01:44:30 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 01 01:44:30 2022 +0000
tree 3525bbbb0430090458993c4c21eee9a979558076
parent 0a17df6696f437efd86696360b63020299233924
parent f3e494e70fc3c6248b4ce1124c7ba1cf8ee8cb18

Merge "Add value for FUEL_VOLUME_DISPLAY_UNITS in default config." into tm-qpr-dev am: f3e494e70f

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

Change-Id: If978b78d05084ab3908040ac454245ddb7283528
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 7dcaa94..fc9ed47 100644
--- a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
+++ b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h
@@ -471,6 +471,15 @@
 
         {.config =
                  {
+                         .prop = toInt(VehicleProperty::FUEL_VOLUME_DISPLAY_UNITS),
+                         .access = VehiclePropertyAccess::READ_WRITE,
+                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,
+                         .configArray = {(int)VehicleUnit::LITER, (int)VehicleUnit::US_GALLON},
+                 },
+         .initialValue = {.int32Values = {(int)VehicleUnit::LITER}}},
+
+        {.config =
+                 {
                          .prop = toInt(VehicleProperty::HW_KEY_INPUT),
                          .access = VehiclePropertyAccess::READ,
                          .changeMode = VehiclePropertyChangeMode::ON_CHANGE,