diff options
| author | 2023-04-11 01:34:06 +0000 | |
|---|---|---|
| committer | 2023-04-11 01:34:06 +0000 | |
| commit | 8facdc05e959b36c86deb230c46b747aff336810 (patch) | |
| tree | 786a0f3dc3a62536fb5005dd6ae82dd07ef05c01 | |
| parent | 4a58d9f42924f774da2f4f33c820925d1803d1a8 (diff) | |
| parent | c7ffdf8bd63cb79faab7802363b97ce2792b1ea5 (diff) | |
Add VanillaIceCream to android.os.Build am: c7ffdf8bd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22532126
Change-Id: Ic44c0daf7855c213ae02e1c5d42e1d0f08c383ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rwxr-xr-x | core/java/android/os/Build.java | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index e10fbf20b772..3a785daea5b1 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 = 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". */ |