summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Paik2018-05-16 19:41:33 -0500
committerSteve Paik2018-05-16 19:48:49 -0500
commit3de778f4482d6e15b316fc216b7c1a64c54816b0 (patch)
tree6ae649e7528cfc3856483ea8bfee6d5428901cc5 /automotive
parente9a39e2714c7311fb88b38f509a96764671dae96 (diff)
downloadplatform-hardware-interfaces-3de778f4482d6e15b316fc216b7c1a64c54816b0.tar.gz
platform-hardware-interfaces-3de778f4482d6e15b316fc216b7c1a64c54816b0.tar.xz
platform-hardware-interfaces-3de778f4482d6e15b316fc216b7c1a64c54816b0.zip
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
Diffstat (limited to 'automotive')
-rw-r--r--automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h3
-rw-r--r--automotive/vehicle/2.0/types.hal12
2 files changed, 3 insertions, 12 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 012af1e0..26041371 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[]{
495 495
496 {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT), 496 {.config = {.prop = toInt(VehicleProperty::AP_POWER_STATE_REPORT),
497 .access = VehiclePropertyAccess::WRITE, 497 .access = VehiclePropertyAccess::WRITE,
498 .changeMode = VehiclePropertyChangeMode::ON_CHANGE, 498 .changeMode = VehiclePropertyChangeMode::ON_CHANGE},
499 .configArray = {3}},
500 .initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}}, 499 .initialValue = {.int32Values = {toInt(VehicleApPowerStateReport::BOOT_COMPLETE), 0}}},
501 500
502 {.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS), 501 {.config = {.prop = toInt(VehicleProperty::DISPLAY_BRIGHTNESS),
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal
index 23f9b779..d30aa6e4 100644
--- a/automotive/vehicle/2.0/types.hal
+++ b/automotive/vehicle/2.0/types.hal
@@ -1090,8 +1090,8 @@ enum VehicleProperty : int32_t {
1090 * It is assumed that AP's power state is controller by separate power 1090 * It is assumed that AP's power state is controller by separate power
1091 * controller. 1091 * controller.
1092 * 1092 *
1093 * For configuration information, VehiclePropConfig.configFlags can 1093 * For configuration information, VehiclePropConfig.configArray can have bit flag combining
1094 * have bit flag combining values in VehicleApPowerStateConfigFlag. 1094 * values in VehicleApPowerStateConfigFlag.
1095 * 1095 *
1096 * int32Values[0] : VehicleApPowerStateReq enum value 1096 * int32Values[0] : VehicleApPowerStateReq enum value
1097 * int32Values[1] : additional parameter relevant for each state, 1097 * int32Values[1] : additional parameter relevant for each state,
@@ -2582,14 +2582,6 @@ struct VehiclePropConfig {
2582 */ 2582 */
2583 vec<VehicleAreaConfig> areaConfigs; 2583 vec<VehicleAreaConfig> areaConfigs;
2584 2584
2585 /**
2586 * Configuration flags for this property.
2587 *
2588 * For example, it may store the number of presets that are stored by the
2589 * radio module.
2590 */
2591 int32_t configFlags;
2592
2593 /** Contains additional configuration parameters */ 2585 /** Contains additional configuration parameters */
2594 vec<int32_t> configArray; 2586 vec<int32_t> configArray;
2595 2587