commit 3b16630e52c2d698320f2b40d2bdd1e0eb94acfb
author Colin Cross <ccross@android.com> Mon Oct 30 21:51:22 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Oct 30 21:51:22 2023 +0000
tree fc1b14319d3bac054a39e1692fe265af09756854
parent 58f23a8e53cfeb1ac23a9f8696de3567dcb66fa1
parent 10b8f8de382ca360e2d87dc010faf7e889c6ca91

Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant" into main

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index 2c01ac6..7cf7e19 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -32664,7 +32664,7 @@
     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 {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 509c3b8..a9b7257 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 @@
         /**
          * Vanilla Ice Cream.
          */
+        @FlaggedApi(Flags.FLAG_ANDROID_OS_BUILD_VANILLA_ICE_CREAM)
         public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
     }
 

core/java/android/os/flags.aconfig

diff --git a/core/java/android/os/flags.aconfig b/core/java/android/os/flags.aconfig
index 77229c4..4031153 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."