Added FACE_AND_DEFROST and FACE_DEFROST_AND_FLOOR to CarHvacFanDirection
CarHvacFanDirection was missing two enums: FACE | DEFROST and FACE |
DEFROST | FLOOR. This CL adds those two missing enums to the file.
Bug: 279498101
Test: atest CarPropertyManagerTest
Change-Id: Ia6e6da95b974e9ec53833ab840319a40f3fc647f
diff --git a/car-lib-module/api/system-current.txt b/car-lib-module/api/system-current.txt
index 93ea1cb..301e419 100644
--- a/car-lib-module/api/system-current.txt
+++ b/car-lib-module/api/system-current.txt
@@ -969,7 +969,9 @@
field public static final int DEFROST = 4; // 0x4
field public static final int DEFROST_AND_FLOOR = 6; // 0x6
field public static final int FACE = 1; // 0x1
+ field public static final int FACE_AND_DEFROST = 5; // 0x5
field public static final int FACE_AND_FLOOR = 3; // 0x3
+ field public static final int FACE_DEFROST_AND_FLOOR = 7; // 0x7
field public static final int FLOOR = 2; // 0x2
field public static final int UNKNOWN = 0; // 0x0
}
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 93ea1cb..301e419 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -969,7 +969,9 @@
field public static final int DEFROST = 4; // 0x4
field public static final int DEFROST_AND_FLOOR = 6; // 0x6
field public static final int FACE = 1; // 0x1
+ field public static final int FACE_AND_DEFROST = 5; // 0x5
field public static final int FACE_AND_FLOOR = 3; // 0x3
+ field public static final int FACE_DEFROST_AND_FLOOR = 7; // 0x7
field public static final int FLOOR = 2; // 0x2
field public static final int UNKNOWN = 0; // 0x0
}
diff --git a/car-lib/api/test-current.txt b/car-lib/api/test-current.txt
index 8fabab9..e7bb44f 100644
--- a/car-lib/api/test-current.txt
+++ b/car-lib/api/test-current.txt
@@ -1043,7 +1043,9 @@
field public static final int DEFROST = 4; // 0x4
field public static final int DEFROST_AND_FLOOR = 6; // 0x6
field public static final int FACE = 1; // 0x1
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.VANILLA_ICE_CREAM_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.UPSIDE_DOWN_CAKE_0) public static final int FACE_AND_DEFROST = 5; // 0x5
field public static final int FACE_AND_FLOOR = 3; // 0x3
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.VANILLA_ICE_CREAM_0, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.UPSIDE_DOWN_CAKE_0) public static final int FACE_DEFROST_AND_FLOOR = 7; // 0x7
field public static final int FLOOR = 2; // 0x2
field public static final int UNKNOWN = 0; // 0x0
}
diff --git a/car-lib/src/android/car/hardware/CarHvacFanDirection.java b/car-lib/src/android/car/hardware/CarHvacFanDirection.java
index 7a9164d..bc73277 100644
--- a/car-lib/src/android/car/hardware/CarHvacFanDirection.java
+++ b/car-lib/src/android/car/hardware/CarHvacFanDirection.java
@@ -19,6 +19,7 @@
import android.annotation.IntDef;
import android.annotation.SystemApi;
import android.car.annotation.AddedInOrBefore;
+import android.car.annotation.ApiRequirements;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -54,9 +55,18 @@
/** Constant for defrost direction. */
@AddedInOrBefore(majorVersion = 33)
public static final int DEFROST = 0x04;
+ /** Constant for face and defrost direction. */
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.VANILLA_ICE_CREAM_0,
+ minPlatformVersion = ApiRequirements.PlatformVersion.UPSIDE_DOWN_CAKE_0)
+ public static final int FACE_AND_DEFROST = 0x05; // FACE_AND_DEFROST= FACE | DEFROST
/** Constant for defrost and floor direction.*/
@AddedInOrBefore(majorVersion = 33)
public static final int DEFROST_AND_FLOOR = 0x06; // DEFROST_AND_FLOOR = DEFROST | FLOOR
+ /** Constant for face, defrost and floor direction.*/
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.VANILLA_ICE_CREAM_0,
+ minPlatformVersion = ApiRequirements.PlatformVersion.UPSIDE_DOWN_CAKE_0)
+ public static final int FACE_DEFROST_AND_FLOOR = 0x07; // FACE_DEFROST_AND_FLOOR = FACE |
+ // DEFROST | FLOOR
/**@hide*/
@IntDef(value = {
@@ -65,7 +75,9 @@
FLOOR,
FACE_AND_FLOOR,
DEFROST,
- DEFROST_AND_FLOOR
+ FACE_AND_DEFROST,
+ DEFROST_AND_FLOOR,
+ FACE_DEFROST_AND_FLOOR
})
@Retention(RetentionPolicy.SOURCE)
public @interface Enum {}
