Add NOT_AVAILABLE_POOR_VISIBILITY to ErrorState in java layer
Added NOT_AVAILABLE_POOR_VISIBILITY to ErrorState enum between
NOT_AVAILABLE_SPEED_HIGH and NOT_AVAILABLE_SAFETY to be consistent with
StatusCode.
Bug: 267174892
Test: atest CtsCarTestCases:CarPropertyManagerTest
Test: atest AndroidCarApiTest:ErrorStateTest
Change-Id: I072edb073ffeb8dc7feacb53aef8458dc5782d26
diff --git a/car-lib-module/api/system-current.txt b/car-lib-module/api/system-current.txt
index 5ee48b0..79779e3 100644
--- a/car-lib-module/api/system-current.txt
+++ b/car-lib-module/api/system-current.txt
@@ -1006,7 +1006,8 @@
public final class ErrorState {
method @NonNull public static String toString(int);
field public static final int NOT_AVAILABLE_DISABLED = -2; // 0xfffffffe
- field public static final int NOT_AVAILABLE_SAFETY = -5; // 0xfffffffb
+ field public static final int NOT_AVAILABLE_POOR_VISIBILITY = -5; // 0xfffffffb
+ field public static final int NOT_AVAILABLE_SAFETY = -6; // 0xfffffffa
field public static final int NOT_AVAILABLE_SPEED_HIGH = -4; // 0xfffffffc
field public static final int NOT_AVAILABLE_SPEED_LOW = -3; // 0xfffffffd
field public static final int OTHER_ERROR_STATE = -1; // 0xffffffff
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 5ee48b0..79779e3 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -1006,7 +1006,8 @@
public final class ErrorState {
method @NonNull public static String toString(int);
field public static final int NOT_AVAILABLE_DISABLED = -2; // 0xfffffffe
- field public static final int NOT_AVAILABLE_SAFETY = -5; // 0xfffffffb
+ field public static final int NOT_AVAILABLE_POOR_VISIBILITY = -5; // 0xfffffffb
+ field public static final int NOT_AVAILABLE_SAFETY = -6; // 0xfffffffa
field public static final int NOT_AVAILABLE_SPEED_HIGH = -4; // 0xfffffffc
field public static final int NOT_AVAILABLE_SPEED_LOW = -3; // 0xfffffffd
field public static final int OTHER_ERROR_STATE = -1; // 0xffffffff
diff --git a/car-lib/api/test-current.txt b/car-lib/api/test-current.txt
index 386c4ec..d641383 100644
--- a/car-lib/api/test-current.txt
+++ b/car-lib/api/test-current.txt
@@ -1077,7 +1077,8 @@
public final class ErrorState {
method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @NonNull public static String toString(int);
field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_DISABLED = -2; // 0xfffffffe
- field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_SAFETY = -5; // 0xfffffffb
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_POOR_VISIBILITY = -5; // 0xfffffffb
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_SAFETY = -6; // 0xfffffffa
field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_SPEED_HIGH = -4; // 0xfffffffc
field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int NOT_AVAILABLE_SPEED_LOW = -3; // 0xfffffffd
field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final int OTHER_ERROR_STATE = -1; // 0xffffffff
diff --git a/car-lib/src/android/car/hardware/property/ErrorState.java b/car-lib/src/android/car/hardware/property/ErrorState.java
index bc2476a..d5883a0 100644
--- a/car-lib/src/android/car/hardware/property/ErrorState.java
+++ b/car-lib/src/android/car/hardware/property/ErrorState.java
@@ -59,7 +59,11 @@
@ApiRequirements(minCarVersion = ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0,
minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
- public static final int NOT_AVAILABLE_SAFETY = -5;
+ public static final int NOT_AVAILABLE_POOR_VISIBILITY = -5;
+
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.UPSIDE_DOWN_CAKE_0,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
+ public static final int NOT_AVAILABLE_SAFETY = -6;
private ErrorState() {}
@@ -79,6 +83,8 @@
return "NOT_AVAILABLE_SPEED_LOW";
case NOT_AVAILABLE_SPEED_HIGH:
return "NOT_AVAILABLE_SPEED_HIGH";
+ case NOT_AVAILABLE_POOR_VISIBILITY:
+ return "NOT_AVAILABLE_POOR_VISIBILITY";
case NOT_AVAILABLE_SAFETY:
return "NOT_AVAILABLE_SAFETY";
default:
@@ -88,7 +94,7 @@
/** @hide */
@IntDef({OTHER_ERROR_STATE, NOT_AVAILABLE_DISABLED, NOT_AVAILABLE_SPEED_LOW,
- NOT_AVAILABLE_SPEED_HIGH, NOT_AVAILABLE_SAFETY})
+ NOT_AVAILABLE_SPEED_HIGH, NOT_AVAILABLE_POOR_VISIBILITY, NOT_AVAILABLE_SAFETY})
@Retention(RetentionPolicy.SOURCE)
public @interface ErrorStateInt {}
}
diff --git a/tests/android_car_api_test/src/android/car/apitest/ErrorStateTest.java b/tests/android_car_api_test/src/android/car/apitest/ErrorStateTest.java
index f639c2a..7bafa51 100644
--- a/tests/android_car_api_test/src/android/car/apitest/ErrorStateTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/ErrorStateTest.java
@@ -62,6 +62,12 @@
.NOT_AVAILABLE_SPEED_HIGH
},
{
+ android.car.hardware.property.ErrorState
+ .NOT_AVAILABLE_POOR_VISIBILITY,
+ android.hardware.automotive.vehicle.ErrorState
+ .NOT_AVAILABLE_POOR_VISIBILITY
+ },
+ {
android.car.hardware.property.ErrorState.NOT_AVAILABLE_SAFETY,
android.hardware.automotive.vehicle.ErrorState.NOT_AVAILABLE_SAFETY
}
