Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d7be47b authored by Shrikar Amirisetty's avatar Shrikar Amirisetty Committed by Automerger Merge Worker
Browse files

Merge "Change default units to be consistent in tm-qpr-dev/DefaultConfig.h"... 

Merge "Change default units to be consistent in tm-qpr-dev/DefaultConfig.h" into tm-qpr-dev am: 53cb2459

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



Change-Id: Ibe4529d4e61d574076ee2a72e573fa4eaaeaf1e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81f4ddd0 53cb2459

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

+2 −2
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                                         toInt(VehicleUnit::MILES_PER_HOUR),

                                         toInt(VehicleUnit::KILOMETERS_PER_HOUR)},

                 },

         .initialValue = {.int32Values = {toInt(VehicleUnit::KILOMETERS_PER_HOUR)}}},

         .initialValue = {.int32Values = {toInt(VehicleUnit::MILES_PER_HOUR)}}},



        {.config =

                 {
@@ -1025,7 +1025,7 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                         .configArray = {(int)VehicleUnit::LITER, (int)VehicleUnit::US_GALLON},

                 },

         .initialValue = {.int32Values = {(int)VehicleUnit::LITER}}},

         .initialValue = {.int32Values = {(int)VehicleUnit::US_GALLON}}},



        {.config =

                 {