Remove deprecated annotation.
The fields still need to be used by client and implemented by VHAL
server, so they should not considered deprecated.
Flag: EXEMPT HAL
Test: Presubmit
Bug: 382563296
Change-Id: I990947651b2563dc26b1f58aa03818d5630f8dd7
diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
index e3f8605..465d9d4 100644
--- a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
+++ b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
@@ -35,33 +35,12 @@
@JavaDerive(equals=true, toString=true) @RustDerive(Clone=true) @VintfStability
parcelable VehicleAreaConfig {
int areaId;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code INT32} type property. Ignored for other types. The optional minimum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the min supported value ({@code MinMaxSupportedValueResult.minSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minInt32Value} and {@code maxInt32Value} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
int minInt32Value;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code INT32} type property. Ignored for other types. The optional maximum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the max supported value ({@code MinMaxSupportedValueResult.maxSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minInt32Value} and {@code maxInt32Value} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
int maxInt32Value;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code INT64} type property. Ignored for other types. The optional minimum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the min supported value ({@code MinMaxSupportedValueResult.minSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minInt64Value} and {@code maxInt64Value} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
long minInt64Value;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code INT64} type property. Ignored for other types. The optional maximum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the max supported value ({@code MinMaxSupportedValueResult.maxSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minInt64Value} and {@code maxInt64Value} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
long maxInt64Value;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code FLOAT} type property. Ignored for other types. The optional minimum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the min supported value ({@code MinMaxSupportedValueResult.minSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minFloatValue} and {@code maxFloatValue} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
float minFloatValue;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for {@code FLOAT} type property. Ignored for other types. The optional maximum value at boot time. For backward compatibility, if {@code HasSupportedValueInfo.hasMinSupportedValue} is {@code true}, and {@code HasSupportedValueInfo.hasMaxSupportedValue} is {@code true}, this must be equal to the max supported value ({@code MinMaxSupportedValueResult.maxSupportedValue}) at boot time. If no minimum or maximum value is available at boot time, both {@code minFloatValue} and {@code maxFloatValue} must be set to 0. If either one is not 0, then we assume min and max both take effect.
- */
float maxFloatValue;
- /**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead. Only applicable for property with {@code @data_enum} annotation. Ignored for other properties. Optional supported subset of supported values at boot time. If the property has a @data_enum and supportedEnumValues is {@code null}, then it is assumed all @data_enum values are supported unless specified through another mechanism. For backward compatibility, if {@code HasSupportedValueInfo.hasSupportedValuesList} is {@code true} and this property has {@code data_enum} annotation, this must be set to the same as {@code SupportedValuesListResult.supportedValuesList} at boot time.
- */
@nullable long[] supportedEnumValues;
android.hardware.automotive.vehicle.VehiclePropertyAccess access = android.hardware.automotive.vehicle.VehiclePropertyAccess.NONE;
boolean supportVariableUpdateRate;
diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl b/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
index c6b8cd1..1720628 100644
--- a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
+++ b/automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl
@@ -29,7 +29,7 @@
int areaId;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code INT32} type property. Ignored for other types.
*
@@ -49,7 +49,7 @@
int minInt32Value;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code INT32} type property. Ignored for other types.
*
@@ -69,7 +69,7 @@
int maxInt32Value;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code INT64} type property. Ignored for other types.
*
@@ -89,7 +89,7 @@
long minInt64Value;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code INT64} type property. Ignored for other types.
*
@@ -109,7 +109,7 @@
long maxInt64Value;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code FLOAT} type property. Ignored for other types.
*
@@ -129,7 +129,7 @@
float minFloatValue;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for {@code FLOAT} type property. Ignored for other types.
*
@@ -149,7 +149,7 @@
float maxFloatValue;
/**
- * @deprecated client should use {@code getMinMaxSupportedValue} instead.
+ * client should use {@code getMinMaxSupportedValue} instead.
*
* Only applicable for property with {@code @data_enum} annotation. Ignored
* for other properties.