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

Commit b0b5f05d authored by Sean Hong's avatar Sean Hong Committed by Automerger Merge Worker
Browse files

Merge "Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test" into... 

Merge "Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test" into tm-qpr-dev am: ebafec19 am: ebb8dc65

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



Change-Id: I53e16522932d34ab619e5f6e926ead41ca9ddb83
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 04dc244b ebb8dc65

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

+2 −8
Original line number Diff line number Diff line
@@ -963,14 +963,7 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                 },

         .initialValue = {.int32Values = {LIGHT_SWITCH_AUTO}}},



        {.config =

                 {

                         .prop = toInt(VehicleProperty::FOG_LIGHTS_SWITCH),

                         .access = VehiclePropertyAccess::READ_WRITE,

                         .changeMode = VehiclePropertyChangeMode::ON_CHANGE,

                 },

         .initialValue = {.int32Values = {LIGHT_SWITCH_AUTO}}},



        // FOG_LIGHTS_SWITCH must not be implemented when FRONT_FOG_LIGHTS_SWITCH is implemented

        {.config =

                 {

                         .prop = toInt(VehicleProperty::FRONT_FOG_LIGHTS_SWITCH),
@@ -979,6 +972,7 @@ const std::vector<ConfigDeclaration> kVehicleProperties = { 
                 },

         .initialValue = {.int32Values = {LIGHT_SWITCH_AUTO}}},



        // FOG_LIGHTS_SWITCH must not be implemented when REAR_FOG_LIGHTS_SWITCH is implemented

        {.config =

                 {

                         .prop = toInt(VehicleProperty::REAR_FOG_LIGHTS_SWITCH),