Replaced addedIn(33,1) with ApiRequirements annotation
Bug: 237080017
Test: m
Change-Id: I669d2805a90ebd41b9d9b8f98078df5897749849
diff --git a/car-lib-module/api/test-current.txt b/car-lib-module/api/test-current.txt
index 12c6bc2..6e8d8eb 100644
--- a/car-lib-module/api/test-current.txt
+++ b/car-lib-module/api/test-current.txt
@@ -113,8 +113,8 @@
public final class CarTestManager {
ctor public CarTestManager(@NonNull android.car.Car, @NonNull android.os.IBinder);
- method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public String dumpVhal(java.util.List<java.lang.String>, long);
- method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public boolean hasAidlVhal() throws android.os.RemoteException;
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public String dumpVhal(java.util.List<java.lang.String>, long);
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public boolean hasAidlVhal() throws android.os.RemoteException;
method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public void startCarService(@NonNull android.os.IBinder);
method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public void stopCarService(@NonNull android.os.IBinder);
}
diff --git a/car-lib/api/test-current.txt b/car-lib/api/test-current.txt
index cc5e0b2..eb4d502 100644
--- a/car-lib/api/test-current.txt
+++ b/car-lib/api/test-current.txt
@@ -67,7 +67,7 @@
field public static final String PERMISSION_CONTROL_EXTERIOR_LIGHTS = "android.car.permission.CONTROL_CAR_EXTERIOR_LIGHTS";
field public static final String PERMISSION_CONTROL_SHUTDOWN_PROCESS = "android.car.permission.CONTROL_SHUTDOWN_PROCESS";
field public static final String PERMISSION_EXTERIOR_LIGHTS = "android.car.permission.CAR_EXTERIOR_LIGHTS";
- field public static final String PERMISSION_MANAGE_THREAD_PRIORITY = "android.car.permission.MANAGE_THREAD_PRIORITY";
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final String PERMISSION_MANAGE_THREAD_PRIORITY = "android.car.permission.MANAGE_THREAD_PRIORITY";
field public static final String PERMISSION_MILEAGE = "android.car.permission.CAR_MILEAGE";
field @Deprecated public static final String PERMISSION_MOCK_VEHICLE_HAL = "android.car.permission.CAR_MOCK_VEHICLE_HAL";
field public static final String PERMISSION_MONITOR_CAR_EVS_STATUS = "android.car.permission.MONITOR_CAR_EVS_STATUS";
@@ -431,14 +431,14 @@
}
public final class CarPackageManager {
- method @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @NonNull @RequiresPermission(android.Manifest.permission.QUERY_ALL_PACKAGES) public android.car.CarVersion getTargetCarVersion(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
method public boolean isActivityBackedBySafeActivity(android.content.ComponentName);
method @Deprecated public void setAppBlockingPolicy(String, android.car.content.pm.CarAppBlockingPolicy, int);
method public void setEnableActivityBlocking(boolean);
field @Deprecated public static final int FLAG_SET_POLICY_ADD = 2; // 0x2
field @Deprecated public static final int FLAG_SET_POLICY_REMOVE = 4; // 0x4
field @Deprecated public static final int FLAG_SET_POLICY_WAIT_FOR_CHANGE = 1; // 0x1
- field public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) public static final String MANIFEST_METADATA_TARGET_CAR_VERSION = "android.car.targetCarVersion";
}
}
@@ -1187,21 +1187,21 @@
method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) @RequiresPermission(android.car.Car.PERMISSION_MANAGE_THREAD_PRIORITY) public void setThreadPriority(@NonNull android.car.os.ThreadPolicyWithPriority) throws android.car.os.CarPerformanceManager.SetSchedulerFailedException;
}
- public static final class CarPerformanceManager.SetSchedulerFailedException extends java.lang.Exception {
+ @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final class CarPerformanceManager.SetSchedulerFailedException extends java.lang.Exception {
}
public final class ThreadPolicyWithPriority implements android.os.Parcelable {
ctor public ThreadPolicyWithPriority(int, @IntRange(from=0, to=99) int);
- method public int describeContents();
- method public int getPolicy();
- method @IntRange(from=0, to=99) public int getPriority();
- method public void writeToParcel(@NonNull android.os.Parcel, int);
- field @NonNull public static final android.os.Parcelable.Creator<android.car.os.ThreadPolicyWithPriority> CREATOR;
- field public static final int PRIORITY_MAX = 99; // 0x63
- field public static final int PRIORITY_MIN = 1; // 0x1
- field public static final int SCHED_DEFAULT = 0; // 0x0
- field public static final int SCHED_FIFO = 1; // 0x1
- field public static final int SCHED_RR = 2; // 0x2
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public int describeContents();
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public int getPolicy();
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) @IntRange(from=0, to=99) public int getPriority();
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public void writeToParcel(@NonNull android.os.Parcel, int);
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) @NonNull public static final android.os.Parcelable.Creator<android.car.os.ThreadPolicyWithPriority> CREATOR;
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final int PRIORITY_MAX = 99; // 0x63
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final int PRIORITY_MIN = 1; // 0x1
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final int SCHED_DEFAULT = 0; // 0x0
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final int SCHED_FIFO = 1; // 0x1
+ field @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_1) public static final int SCHED_RR = 2; // 0x2
}
}
@@ -1444,8 +1444,8 @@
public final class CarTestManager {
ctor public CarTestManager(@NonNull android.car.Car, @NonNull android.os.IBinder);
- method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public String dumpVhal(java.util.List<java.lang.String>, long);
- method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public boolean hasAidlVhal() throws android.os.RemoteException;
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public String dumpVhal(java.util.List<java.lang.String>, long);
+ method @android.car.annotation.ApiRequirements(minCarVersion=android.car.annotation.ApiRequirements.CarVersion.TIRAMISU_1, minPlatformVersion=android.car.annotation.ApiRequirements.PlatformVersion.TIRAMISU_0) @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public boolean hasAidlVhal() throws android.os.RemoteException;
method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public void startCarService(@NonNull android.os.IBinder);
method @RequiresPermission(android.car.Car.PERMISSION_CAR_TEST_SERVICE) public void stopCarService(@NonNull android.os.IBinder);
}
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index 00e75d6..527d29f 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -1139,7 +1139,8 @@
* @hide
*/
@SystemApi
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final String PERMISSION_MANAGE_THREAD_PRIORITY =
"android.car.permission.MANAGE_THREAD_PRIORITY";
diff --git a/car-lib/src/android/car/GsrComplianceRequirementType.java b/car-lib/src/android/car/GsrComplianceRequirementType.java
index 73f7986..c19a870 100644
--- a/car-lib/src/android/car/GsrComplianceRequirementType.java
+++ b/car-lib/src/android/car/GsrComplianceRequirementType.java
@@ -16,7 +16,7 @@
package android.car;
import android.annotation.IntDef;
-import android.car.annotation.AddedIn;
+import android.car.annotation.ApiRequirements;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -31,12 +31,14 @@
/**
* GSR compliance is not required.
*/
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public static final int GSR_COMPLIANCE_NOT_REQUIRED = 0;
/**
* GSR compliance is required and the requirement solution version is 1.
*/
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public static final int GSR_COMPLIANCE_REQUIRED_V1 = 1;
/** @hide */
diff --git a/car-lib/src/android/car/PlatformVersionMismatchException.java b/car-lib/src/android/car/PlatformVersionMismatchException.java
index 327cbbd..9392d23 100644
--- a/car-lib/src/android/car/PlatformVersionMismatchException.java
+++ b/car-lib/src/android/car/PlatformVersionMismatchException.java
@@ -18,7 +18,7 @@
import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
import android.annotation.NonNull;
-import android.car.annotation.AddedIn;
+import android.car.annotation.ApiRequirements;
import android.car.annotation.MinimumPlatformSdkVersion;
import android.os.Parcel;
import android.os.Parcelable;
@@ -43,7 +43,8 @@
@Override
@NonNull
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public String getMessage() {
return "Expected version: "
+ mExpectedPlatformApiVersion + ", Current version: " + Car.getPlatformVersion();
@@ -77,14 +78,16 @@
* Gets expected platform API version.
*/
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public @NonNull PlatformVersion getExpectedPlatformApiVersion() {
return mExpectedPlatformApiVersion;
}
@Override
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public void writeToParcel(@NonNull Parcel dest, int flags) {
// You can override field parcelling by defining methods like:
// void parcelFieldName(Parcel dest, int flags) { ... }
@@ -95,7 +98,8 @@
@Override
@DataClass.Generated.Member
@ExcludeFromCodeCoverageGeneratedReport(reason = BOILERPLATE_CODE)
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public int describeContents() { return 0; }
/** @hide */
@@ -116,7 +120,8 @@
}
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public static final @NonNull Parcelable.Creator<PlatformVersionMismatchException> CREATOR
= new Parcelable.Creator<PlatformVersionMismatchException>() {
@Override
diff --git a/car-lib/src/android/car/VehiclePropertyIds.java b/car-lib/src/android/car/VehiclePropertyIds.java
index f90a57c..3fc57c5 100644
--- a/car-lib/src/android/car/VehiclePropertyIds.java
+++ b/car-lib/src/android/car/VehiclePropertyIds.java
@@ -19,8 +19,8 @@
import static com.android.car.internal.ExcludeFromCodeCoverageGeneratedReport.BOILERPLATE_CODE;
import android.annotation.RequiresPermission;
-import android.car.annotation.AddedIn;
import android.car.annotation.AddedInOrBefore;
+import android.car.annotation.ApiRequirements;
import android.car.hardware.CarPropertyValue;
import android.car.hardware.property.VehicleElectronicTollCollectionCardStatus;
import android.car.hardware.property.VehicleElectronicTollCollectionCardType;
@@ -2272,7 +2272,8 @@
* <p>Requires permission: {@link Car#PERMISSION_CAR_INFO}.
*/
@RequiresPermission.Read(@RequiresPermission(Car.PERMISSION_CAR_INFO))
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public static final int GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT = 289410887;
/*
diff --git a/car-lib/src/android/car/app/CarActivityManager.java b/car-lib/src/android/car/app/CarActivityManager.java
index 2d6fac6..7dca5c1 100644
--- a/car-lib/src/android/car/app/CarActivityManager.java
+++ b/car-lib/src/android/car/app/CarActivityManager.java
@@ -24,8 +24,8 @@
import android.app.ActivityManager;
import android.car.Car;
import android.car.CarManagerBase;
-import android.car.annotation.AddedIn;
import android.car.annotation.AddedInOrBefore;
+import android.car.annotation.ApiRequirements;
import android.car.user.CarUserManager;
import android.content.ActivityNotFoundException;
import android.content.ComponentName;
@@ -240,7 +240,8 @@
* @hide
*/
@RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS)
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
@NonNull
public List<ActivityManager.RunningTaskInfo> getVisibleTasks() {
try {
diff --git a/car-lib/src/android/car/content/pm/CarPackageManager.java b/car-lib/src/android/car/content/pm/CarPackageManager.java
index 842cb5f..01e5dca 100644
--- a/car-lib/src/android/car/content/pm/CarPackageManager.java
+++ b/car-lib/src/android/car/content/pm/CarPackageManager.java
@@ -30,8 +30,8 @@
import android.car.Car;
import android.car.CarManagerBase;
import android.car.CarVersion;
-import android.car.annotation.AddedIn;
import android.car.annotation.AddedInOrBefore;
+import android.car.annotation.ApiRequirements;
import android.content.ComponentName;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.IBinder;
@@ -188,7 +188,8 @@
*
* @hide
*/
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
@SystemApi
public static final String MANIFEST_METADATA_TARGET_CAR_VERSION =
"android.car.targetCarVersion";
@@ -487,7 +488,8 @@
*
* @hide
*/
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
@SystemApi
@RequiresPermission(Manifest.permission.QUERY_ALL_PACKAGES)
@NonNull
@@ -515,7 +517,8 @@
*
* @return targeted Car API version (as defined above)
*/
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
@NonNull
public CarVersion getTargetCarVersion() {
String pkgName = mCar.getContext().getPackageName();
diff --git a/car-lib/src/android/car/os/CarPerformanceManager.java b/car-lib/src/android/car/os/CarPerformanceManager.java
index 51e5ba7..9b727f8 100644
--- a/car-lib/src/android/car/os/CarPerformanceManager.java
+++ b/car-lib/src/android/car/os/CarPerformanceManager.java
@@ -22,7 +22,6 @@
import android.annotation.SystemApi;
import android.car.Car;
import android.car.CarManagerBase;
-import android.car.annotation.AddedIn;
import android.car.annotation.AddedInOrBefore;
import android.car.annotation.ApiRequirements;
import android.car.annotation.ApiRequirements.CarVersion;
@@ -42,7 +41,6 @@
* @hide
*/
@SystemApi
-@AddedIn(majorVersion = 33, minorVersion = 1)
public final class CarPerformanceManager extends CarManagerBase {
private final ICarPerformanceService mService;
@@ -53,7 +51,8 @@
* @hide
*/
@SystemApi
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final class SetSchedulerFailedException extends Exception {
SetSchedulerFailedException(Throwable cause) {
super(cause);
diff --git a/car-lib/src/android/car/os/ThreadPolicyWithPriority.java b/car-lib/src/android/car/os/ThreadPolicyWithPriority.java
index 8733fea..e83d94d 100644
--- a/car-lib/src/android/car/os/ThreadPolicyWithPriority.java
+++ b/car-lib/src/android/car/os/ThreadPolicyWithPriority.java
@@ -20,7 +20,7 @@
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.SystemApi;
-import android.car.annotation.AddedIn;
+import android.car.annotation.ApiRequirements;
import android.os.Parcelable;
import com.android.car.internal.util.AnnotationValidations;
@@ -40,7 +40,6 @@
* @hide
*/
@SystemApi
-@AddedIn(majorVersion = 33, minorVersion = 1)
@DataClass(genConstructor = false, genHiddenConstDefs = true)
public final class ThreadPolicyWithPriority implements Parcelable {
@@ -48,20 +47,23 @@
* Min supported thread priority.
*/
@Priority
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final int PRIORITY_MIN = 1;
/**
* Max supported thread priority.
*/
@Priority
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final int PRIORITY_MAX = 99;
/** @hide */
@IntDef({SCHED_DEFAULT, SCHED_FIFO, SCHED_RR})
@Retention(RetentionPolicy.SOURCE)
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public @interface SchedPolicy {}
/**
@@ -70,7 +72,8 @@
* <p> Same as {@code SCHED_OTHER} defined in {@code /include/uapi/linux/sched.h}.
*/
@Sched
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final int SCHED_DEFAULT = 0;
/**
@@ -79,7 +82,8 @@
* <p>Same as {@code SCHED_FIFO} defined in {@code /include/uapi/linux/sched.h}.
*/
@Sched
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final int SCHED_FIFO = 1;
/**
@@ -88,7 +92,8 @@
* <p>Same as {@code SCHED_RR} defined in {@code /include/uapi/linux/sched.h}.
*/
@Sched
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final int SCHED_RR = 2;
@SchedPolicy
@@ -143,7 +148,8 @@
})
@Retention(RetentionPolicy.SOURCE)
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public @interface Priority {}
/** @hide */
@@ -166,12 +172,14 @@
})
@Retention(RetentionPolicy.SOURCE)
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public @interface Sched {}
/** @hide */
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static String schedToString(@Sched int value) {
switch (value) {
case SCHED_DEFAULT:
@@ -185,20 +193,23 @@
}
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public @SchedPolicy int getPolicy() {
return mPolicy;
}
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public @IntRange(from = 0, to = 99) int getPriority() {
return mPriority;
}
@Override
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public void writeToParcel(@NonNull android.os.Parcel dest, int flags) {
// You can override field parcelling by defining methods like:
// void parcelFieldName(Parcel dest, int flags) { ... }
@@ -209,7 +220,8 @@
@Override
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public int describeContents() { return 0; }
/** @hide */
@@ -235,7 +247,8 @@
}
@DataClass.Generated.Member
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_1)
public static final @NonNull Parcelable.Creator<ThreadPolicyWithPriority> CREATOR
= new Parcelable.Creator<ThreadPolicyWithPriority>() {
@Override
diff --git a/car-lib/src/android/car/test/CarTestManager.java b/car-lib/src/android/car/test/CarTestManager.java
index 4491ac2..97385ea 100644
--- a/car-lib/src/android/car/test/CarTestManager.java
+++ b/car-lib/src/android/car/test/CarTestManager.java
@@ -20,8 +20,8 @@
import android.annotation.TestApi;
import android.car.Car;
import android.car.CarManagerBase;
-import android.car.annotation.AddedIn;
import android.car.annotation.AddedInOrBefore;
+import android.car.annotation.ApiRequirements;
import android.os.IBinder;
import android.os.RemoteException;
@@ -107,7 +107,8 @@
*/
@TestApi
@RequiresPermission(Car.PERMISSION_CAR_TEST_SERVICE)
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public String dumpVhal(List<String> options, long waitTimeoutMs) {
try {
return mService.dumpVhal(options, waitTimeoutMs);
@@ -124,7 +125,8 @@
*/
@TestApi
@RequiresPermission(Car.PERMISSION_CAR_TEST_SERVICE)
- @AddedIn(majorVersion = 33, minorVersion = 1)
+ @ApiRequirements(minCarVersion = ApiRequirements.CarVersion.TIRAMISU_1,
+ minPlatformVersion = ApiRequirements.PlatformVersion.TIRAMISU_0)
public boolean hasAidlVhal() throws RemoteException {
return mService.hasAidlVhal();
}
