Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 652c19eb authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I059de4da7a60bfe0a6d75986de5c38cd707d6115
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3c2c65c 067dd3e1

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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 {

























core/java/android/os/Build.java



+5
−0




























Original line number
Diff line number
Diff line








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