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

Commit 712f41a9 authored by Mårten Kongstad's avatar Mårten Kongstad
Browse files

Add Baklava 

Introduce the version constants (VERSION_CODES and VERSION_CODES_FULL)
for the next Android dessert.

Bug: 350458259
Test: m
Flag: android.sdk.major_minor_versioning_scheme
Change-Id: I8b9bb05cfdbdcea78017fab9db3694c4a4fe8d45
parent eeff0ad5

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -32852,6 +32852,7 @@ package android.os { 














  public static class Build.VERSION_CODES {















    ctor public Build.VERSION_CODES();













    field @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int BAKLAVA = 10000; // 0x2710















    field public static final int BASE = 1; // 0x1















    field public static final int BASE_1_1 = 2; // 0x2















    field public static final int CUPCAKE = 3; // 0x3










@@ -32891,6 +32892,7 @@ package android.os {













  }





























  @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL {













    field public static final int BAKLAVA = 1000000000; // 0x3b9aca00















    field public static final int BASE = 100000; // 0x186a0















    field public static final int BASE_1_1 = 200000; // 0x30d40















    field public static final int CUPCAKE = 300000; // 0x493e0

























core/java/android/os/Build.java



+12
−0




























Original line number
Diff line number
Diff line








@@ -1274,6 +1274,12 @@ public class Build {













         * Vanilla Ice Cream.















         */















        public static final int VANILLA_ICE_CREAM = 35;



























        /**













         * Baklava.













         */













        @FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)













        public static final int BAKLAVA = CUR_DEVELOPMENT;















    }































    /** @hide */










@@ -1313,6 +1319,7 @@ public class Build {













        VERSION_CODES_FULL.TIRAMISU,















        VERSION_CODES_FULL.UPSIDE_DOWN_CAKE,















        VERSION_CODES_FULL.VANILLA_ICE_CREAM,













        VERSION_CODES_FULL.BAKLAVA,















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface SdkIntFull {}










@@ -1514,6 +1521,11 @@ public class Build {













         */















        public static final int VANILLA_ICE_CREAM =















                VERSION_CODES.VANILLA_ICE_CREAM * SDK_INT_MULTIPLIER;



























        /**













         * The upcoming, not yet finalized, version of Android.













         */













        public static final int BAKLAVA = VERSION_CODES.BAKLAVA * SDK_INT_MULTIPLIER;















    }































    /**