From 6fefa59d939e37215febbd6877551923c84daa4c Mon Sep 17 00:00:00 2001 From: seanhong Date: Mon, 11 Jul 2022 21:16:22 +0000 Subject: [PATCH] Remove FOG_LIGHTS_SWITCH from the emulator for the CTS test FOG_LIGHTS_SWITCH should not be implemented when FRONT_FOG_LIGHTS_SWITCH or REAR_FOG_LIGHTS_SWITCH is implemented. Test: atest CarPropertyManagerTest Bug: 237691268 Change-Id: I5d1fc669a038c50e3262b5b057c45300e48848b6 --- .../aidl/impl/default_config/include/DefaultConfig.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h index fc9ed47be3..46f6df5fc3 100644 --- a/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h +++ b/automotive/vehicle/aidl/impl/default_config/include/DefaultConfig.h @@ -952,14 +952,7 @@ const std::vector 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), @@ -968,6 +961,7 @@ const std::vector 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),