diff options
| author | Anton Hansson <hansson@google.com> | 2023-04-13 17:47:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-13 17:47:10 +0000 |
| commit | b6ddcdc1f4ae13c1af4332a06419c184071164f9 (patch) | |
| tree | 72c4f6dabed5a8d2ccb201900e096b0e9d4c2ee9 | |
| parent | e37dc4e37f955513c801e4e02b144f0d44bbb801 (diff) | |
| parent | 5d749e2485ece6dec45ce8b78d2fa7b86e31a5ec (diff) | |
| download | modules-utils-b6ddcdc1f4ae13c1af4332a06419c184071164f9.tar.gz | |
UpsideDownCake is now 34 am: 5d749e2485
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/modules-utils/+/2535803
Change-Id: I84410b36d229f070d67198299955c06e575f2ace
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | build/include/android-modules-utils/sdk_level.h | 5 | ||||
| -rw-r--r-- | java/com/android/modules/utils/build/SdkLevel.java | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/build/include/android-modules-utils/sdk_level.h b/build/include/android-modules-utils/sdk_level.h index 30f0484..35c0331 100644 --- a/build/include/android-modules-utils/sdk_level.h +++ b/build/include/android-modules-utils/sdk_level.h @@ -54,10 +54,7 @@ inline bool IsAtLeastS() { return android_get_device_api_level() >= 31; } inline bool IsAtLeastT() { return android_get_device_api_level() >= 33; } // Checks if the device is running on release version of Android U or newer. -inline bool IsAtLeastU() { - return android_get_device_api_level() >= 33 && - detail::IsAtLeastPreReleaseCodename("U"); -} +inline bool IsAtLeastU() { return android_get_device_api_level() >= 34; } } // namespace sdklevel } // namespace modules diff --git a/java/com/android/modules/utils/build/SdkLevel.java b/java/com/android/modules/utils/build/SdkLevel.java index 45c8c4a..c4ac89b 100644 --- a/java/com/android/modules/utils/build/SdkLevel.java +++ b/java/com/android/modules/utils/build/SdkLevel.java @@ -57,13 +57,10 @@ public final class SdkLevel { return SDK_INT >= 33; } - /** - * Checks if the device is running on a pre-release or release version of Android - * UpsideDownCake or newer - */ - @ChecksSdkIntAtLeast(codename = "UpsideDownCake") + /** Checks if the device is running on a release version of Android UpsideDownCake or newer */ + @ChecksSdkIntAtLeast(api = 34 /* BUILD_VERSION_CODES.UpsideDownCake */) public static boolean isAtLeastU() { - return isAtLeastPreReleaseCodename("UpsideDownCake"); + return SDK_INT >= 34; } private static boolean isAtLeastPreReleaseCodename(@NonNull String codename) { |