From 067dd3e10a9143010da182467c456325690216a5 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Sat, 22 Apr 2023 00:21:36 +0000 Subject: [PATCH] Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build"" This reverts commit f9143c6a357efde7378674d160a6b9f92b9350f0. Reason for revert: reland Change-Id: I48f7ed8349ab0a240874a4bce3c522758a163c3a --- core/api/current.txt | 1 + core/java/android/os/Build.java | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/core/api/current.txt b/core/api/current.txt index 288ab479c0fb2..ce3a9d49df828 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32653,6 +32653,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 } 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 7383e633fb93a..4d3e92b387177 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 = 34; + + /** + * Vanilla Ice Cream. + */ + public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT; } /** The type of build, like "user" or "eng". */