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

Merge changes from topic "V" am: bd3b1b81ee

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

Change-Id: Ic98d8d7f54c293dee9c5049fd64c7ab1c20170ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2023-04-26 00:46:21 +00:00
committed by Automerger Merge Worker
parent 7dc9b3e8a2 bd3b1b81ee
commit f0d2d468fa
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

@@ -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 {

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

@@ -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". */