From f9143c6a357efde7378674d160a6b9f92b9350f0 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Fri, 7 Apr 2023 18:25:22 +0000 Subject: [PATCH] DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build" Revert V changes in U branches. V changes are needed to help resolve merge conflicts as this topic lands in downstream branches. Bug: 275409981 Test: N/A This reverts commit c7ffdf8bd63cb79faab7802363b97ce2792b1ea5. Change-Id: I9422db9c0d980468b7f4678fe06866d06c8c7c31 --- core/api/current.txt | 1 - core/java/android/os/Build.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index d9e0a06f3ec2d..14d9a3e2279f9 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -32654,7 +32654,6 @@ 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 eb4717057145b..9f9c2222f9d9d 100755 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1223,11 +1223,6 @@ 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". */