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

Commit f0d2d468 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes from topic "V" am: bd3b1b81 

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



Change-Id: Ic98d8d7f54c293dee9c5049fd64c7ab1c20170ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dc9b3e8 bd3b1b81

core/api/current.txt

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

























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 = CUR_DEVELOPMENT;



























        /**













         * Vanilla Ice Cream.













         */













        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;















    }































    /** The type of build, like "user" or "eng". */