diff options
| author | 2023-10-12 14:23:08 -0700 | |
|---|---|---|
| committer | 2023-10-27 09:54:35 -0700 | |
| commit | 10b8f8de382ca360e2d87dc010faf7e889c6ca91 (patch) | |
| tree | 5846d81771984ed5dde2e5c8a407c41ab88d4278 | |
| parent | ca0bc9350a7c00ca86801da441c8583e1527d21f (diff) | |
Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant
Bug: 305065851
Test: treehugger
Change-Id: I768ab21f9a76d4d89cfc03e36a417ed5d7482b49
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/flags.aconfig | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4c1d51d2e9d8..e650f95a6ead 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32662,7 +32662,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 public static final int VANILLA_ICE_CREAM = 10000; // 0x2710 + field @FlaggedApi("android.os.android_os_build_vanilla_ice_cream") 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 509c3b88441e..a9b7257a5406 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -17,6 +17,7 @@ package android.os; import android.Manifest; +import android.annotation.FlaggedApi; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; @@ -1227,6 +1228,7 @@ public class Build { /** * Vanilla Ice Cream. */ + @FlaggedApi(Flags.FLAG_ANDROID_OS_BUILD_VANILLA_ICE_CREAM) public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT; } diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig index 77229c44cc8d..40311535fc1e 100644 --- a/core/java/android/os/flags.aconfig +++ b/core/java/android/os/flags.aconfig @@ -1,6 +1,13 @@ package: "android.os" flag { + name: "android_os_build_vanilla_ice_cream" + namespace: "build" + description: "Feature flag for adding the VANILLA_ICE_CREAM constant." + bug: "264658905" +} + +flag { name: "state_of_health_public" namespace: "system_sw_battery" description: "Feature flag for making state_of_health a public api." |