From 3de778f4482d6e15b316fc216b7c1a64c54816b0 Mon Sep 17 00:00:00 2001 From: Steve Paik Date: Wed, 16 May 2018 17:41:33 -0700 Subject: [PATCH] Remove ConfigFlags ConfigArray replaces the need for configFlags. Deprecate this before it gets released. Bug: 74133619 Test: grep -ril configflag shows all instances removed Change-Id: I645862507959738eb2739e70a53827b749e88aeb --- .../2.0/default/impl/vhal_v2_0/DefaultConfig.h | 3 +-- automotive/vehicle/2.0/types.hal | 12 ++---------- current.txt | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index 012af1e00c..26041371fb 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h @@ -495,8 +495,7 @@ const ConfigDeclaration kVehicleProperties[]{ {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT), .access = VehiclePropertyAccess::WRITE, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - .configArray = {3}}, + .changeMode = VehiclePropertyChangeMode::ON_CHANGE}, .initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}}, {.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS), diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 23f9b77983..d30aa6e4a8 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -1090,8 +1090,8 @@ enum VehicleProperty : int32_t { * It is assumed that AP's power state is controller by separate power * controller. * - * For configuration information, VehiclePropConfig.configFlags can - * have bit flag combining values in VehicleApPowerStateConfigFlag. + * For configuration information, VehiclePropConfig.configArray can have bit flag combining + * values in VehicleApPowerStateConfigFlag. * * int32Values[0] : VehicleApPowerStateReq enum value * int32Values[1] : additional parameter relevant for each state, @@ -2582,14 +2582,6 @@ struct VehiclePropConfig { */ vec areaConfigs; - /** - * Configuration flags for this property. - * - * For example, it may store the number of presets that are stored by the - * radio module. - */ - int32_t configFlags; - /** Contains additional configuration parameters */ vec configArray; diff --git a/current.txt b/current.txt index d221238a05..b0a57a1f5c 100644 --- a/current.txt +++ b/current.txt @@ -299,7 +299,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar 3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle 7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback -44c8b452186b65f5140a224721f238b76ed3adc42460f26b801b561593744c7e android.hardware.automotive.vehicle@2.0::types +2415300b470165ec227c7d9e5122d141ecca7231abed673573890934f8f79db1 android.hardware.automotive.vehicle@2.0::types 32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload 27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types