Add ChecksSdkIntAtLeast annotation to isAtLeast* am: a73785b0da am: c9d2d45b2c
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/1652332
Change-Id: If58dd74fa75167f22c5a692e4f010bd75a3bd744
diff --git a/java/com/android/modules/utils/build/Android.bp b/java/com/android/modules/utils/build/Android.bp
index 22f06f1..6a2aec6 100644
--- a/java/com/android/modules/utils/build/Android.bp
+++ b/java/com/android/modules/utils/build/Android.bp
@@ -20,6 +20,7 @@
java_library {
name: "modules-utils-build",
srcs: ["SdkLevel.java"],
+ libs: ["androidx.annotation_annotation"],
sdk_version: "module_current",
min_sdk_version: "29",
visibility: ["//visibility:public"],
@@ -33,6 +34,7 @@
java_library {
name: "modules-utils-build_system",
srcs: ["SdkLevel.java"],
+ libs: ["androidx.annotation_annotation"],
sdk_version: "system_current",
min_sdk_version: "29",
visibility: ["//visibility:public"],
diff --git a/java/com/android/modules/utils/build/SdkLevel.java b/java/com/android/modules/utils/build/SdkLevel.java
index 1f871dd..115b9b9 100644
--- a/java/com/android/modules/utils/build/SdkLevel.java
+++ b/java/com/android/modules/utils/build/SdkLevel.java
@@ -18,6 +18,8 @@
import android.os.Build;
+import androidx.annotation.ChecksSdkIntAtLeast;
+
/**
* Utility class to check SDK level.
*
@@ -28,6 +30,7 @@
private SdkLevel() {}
/** Return true iff the running Android SDK is at least "R". */
+ @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.R)
public static boolean isAtLeastR() {
return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R;
}
@@ -39,6 +42,7 @@
* (e.g. if we add SDK version for R-QPR, the current implementation will not recognise
* pre-release "S" versions built on that).
*/
+ @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.CUR_DEVELOPMENT)
public static boolean isAtLeastS() {
// TODO(b/170831689) This should check SDK_INT >= S once S sdk finalised. Note that removing the
// current conditions may lead to issues in mainlinefood (and possibly public beta?).