Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build"" am: 067dd3e10a

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22797865

Change-Id: I059de4da7a60bfe0a6d75986de5c38cd707d6115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Steven Moreland
2023-04-23 00:32:02 +00:00
committed by Automerger Merge Worker
parent f3c2c65c9a 067dd3e10a
commit 652c19eb38
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -32653,6 +32653,7 @@ package android.os {
field public static final int S_V2 = 32; // 0x20 field public static final int S_V2 = 32; // 0x20
field public static final int TIRAMISU = 33; // 0x21 field public static final int TIRAMISU = 33; // 0x21
field public static final int UPSIDE_DOWN_CAKE = 34; // 0x22 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

5
core/java/android/os/Build.java
View File

@@ -1223,6 +1223,11 @@ public class Build {
* Upside Down Cake. * Upside Down Cake.
*/ */
public static final int UPSIDE_DOWN_CAKE = 34; 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". */ /** The type of build, like "user" or "eng". */