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

Commit de552db4 authored by Michael Wright's avatar Michael Wright Committed by Android (Google) Code Review
Browse files

Merge "V is 35." into main

parents 07531340 e4e3d4a1

core/api/current.txt

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

    field public static final int VANILLA_ICE_CREAM = 35; // 0x23

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1229,7 +1229,7 @@ public class Build {













        /**















         * Vanilla Ice Cream.















         */













        public static final int VANILLA_ICE_CREAM = CUR_DEVELOPMENT;













        public static final int VANILLA_ICE_CREAM = 35;















    }































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

































tools/aapt/SdkConstants.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -50,6 +50,7 @@ enum {













    SDK_S_V2 = 32,















    SDK_TIRAMISU = 33,















    SDK_UPSIDE_DOWN_CAKE = 34,













    SDK_VANILLA_ICE_CREAM = 35,















    SDK_CUR_DEVELOPMENT = 10000,















};

















































tools/aapt2/SdkConstants.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -60,6 +60,7 @@ enum : ApiVersion {













  SDK_S_V2 = 32,















  SDK_TIRAMISU = 33,















  SDK_UPSIDE_DOWN_CAKE = 34,













  SDK_VANILLA_ICE_CREAM = 35,















  SDK_CUR_DEVELOPMENT = 10000,















};