summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-01-18 13:48:02 -0800
committer Colin Cross <ccross@android.com> 2023-04-24 14:28:43 -0700
commit53d1cf77ca45fed548c041594cfdab7ea90dcfce (patch)
treeec00dc3cb41d2f0d19d32477704e3621348a2aa8
parent1dd09eb77941713254f5c0192d1332c5826dd3f9 (diff)
Add VanillaIceCream to android.os.Build
Bug: 279492191 Test: m checkbuild Change-Id: I1b0a9d667cd481e91cfe473747a9ad38f77b4455 Merged-In: I1b0a9d667cd481e91cfe473747a9ad38f77b4455
-rw-r--r--core/api/current.txt1
-rwxr-xr-xcore/java/android/os/Build.java5
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt
index cf3938ade32d..77a6fec604be 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -31081,6 +31081,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 = 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 244632a87593..2e05b8dc8da3 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -1223,6 +1223,11 @@ public class Build {
* Upside Down Cake.
*/
public static final int UPSIDE_DOWN_CAKE = CUR_DEVELOPMENT;
+
+ /**
+ * Vanilla Ice Cream.
+ */
+ public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;
}
/** The type of build, like "user" or "eng". */