diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-19 00:16:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-19 00:16:11 +0000 |
| commit | 51e8133dcff4aef934d16c422889290bdb8a5183 (patch) | |
| tree | e66b514a6fa0986c9b1c6c499019fa0a204c27f1 /core | |
| parent | 95293e07c602ec129cf501d45c0ce2afe40c1084 (diff) | |
| parent | f334366fd3f97c390e8614ea46fab3e1f67e6897 (diff) | |
| download | base-51e8133dcff4aef934d16c422889290bdb8a5183.tar.gz | |
Merge "Remove @FlaggedApi for android.os.Build.VANILLA_ICE_CREAM" into main
Diffstat (limited to 'core')
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 48949f8883bd..588396ac2140 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -31980,7 +31980,7 @@ package android.os { field public static final int S_V2 = 32; // 0x20 field public static final int TIRAMISU = 33; // 0x21 field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22 - field @FlaggedApi("android.os.android_os_build_vanilla_ice_cream") public static final int VANILLA_ICE_CREAM = 10000; // 0x2710 + field public static final int VANILLA_ICE_CREAM = 10000; // 0x2710 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 58717179d64d..a7d17f599fdb 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -17,7 +17,6 @@ package android.os; import android.Manifest; -import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; @@ -1228,7 +1227,6 @@ public class Build { /** * Vanilla Ice Cream. */ - @FlaggedApi(Flags.FLAG_ANDROID_OS_BUILD_VANILLA_ICE_CREAM) public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT; } |