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

Commit 1f3f2d44 authored Jan 21, 2025 by Linus Tufvesson Committed by Android (Google) Code Review Jan 21, 2025

Merge "B is 36." into main

parents 2ae37985 5ae6e84c

core/api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -33468,7 +33468,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 @FlaggedApi("android.sdk.major_minor_versioning_scheme") public static final int BAKLAVA = 36; // 0x24
		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
		@@ -33508,7 +33508,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 BAKLAVA = 3600000; // 0x36ee80
		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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1271,7 +1271,7 @@ public class Build {
		* Baklava.
		*/
		@FlaggedApi(Flags.FLAG_MAJOR_MINOR_VERSIONING_SCHEME)
		public static final int BAKLAVA = CUR_DEVELOPMENT;
		public static final int BAKLAVA = 36;
		}

		/** @hide */

tools/aapt/SdkConstants.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ enum {
		SDK_TIRAMISU = 33,
		SDK_UPSIDE_DOWN_CAKE = 34,
		SDK_VANILLA_ICE_CREAM = 35,
		SDK_BAKLAVA = 36,
		SDK_CUR_DEVELOPMENT = 10000,
		};

tools/aapt2/SdkConstants.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,7 @@ enum : ApiVersion {
		SDK_TIRAMISU = 33,
		SDK_UPSIDE_DOWN_CAKE = 34,
		SDK_VANILLA_ICE_CREAM = 35,
		SDK_BAKLAVA = 36,
		SDK_CUR_DEVELOPMENT = 10000,
		};