Merge "Build.VERSION_CODES_FULL: backfill older Android versions" into main (57a35899) · Commits · e / os / android_frameworks_base

core/api/current.txt

+35 −0

Original line number	Diff line number	Diff line
		@@ -32880,6 +32880,41 @@ package android.os {
		}

		@FlaggedApi("android.sdk.major_minor_versioning_scheme") public static class Build.VERSION_CODES_FULL {
		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
		field public static final int DONUT = 400000; // 0x61a80
		field public static final int ECLAIR = 500000; // 0x7a120
		field public static final int ECLAIR_0_1 = 600000; // 0x927c0
		field public static final int ECLAIR_MR1 = 700000; // 0xaae60
		field public static final int FROYO = 800000; // 0xc3500
		field public static final int GINGERBREAD = 900000; // 0xdbba0
		field public static final int GINGERBREAD_MR1 = 1000000; // 0xf4240
		field public static final int HONEYCOMB = 1100000; // 0x10c8e0
		field public static final int HONEYCOMB_MR1 = 1200000; // 0x124f80
		field public static final int HONEYCOMB_MR2 = 1300000; // 0x13d620
		field public static final int ICE_CREAM_SANDWICH = 1400000; // 0x155cc0
		field public static final int ICE_CREAM_SANDWICH_MR1 = 1500000; // 0x16e360
		field public static final int JELLY_BEAN = 1600000; // 0x186a00
		field public static final int JELLY_BEAN_MR1 = 1700000; // 0x19f0a0
		field public static final int JELLY_BEAN_MR2 = 1800000; // 0x1b7740
		field public static final int KITKAT = 1900000; // 0x1cfde0
		field public static final int KITKAT_WATCH = 2000000; // 0x1e8480
		field public static final int LOLLIPOP = 2100000; // 0x200b20
		field public static final int LOLLIPOP_MR1 = 2200000; // 0x2191c0
		field public static final int M = 2300000; // 0x231860
		field public static final int N = 2400000; // 0x249f00
		field public static final int N_MR1 = 2500000; // 0x2625a0
		field public static final int O = 2600000; // 0x27ac40
		field public static final int O_MR1 = 2700000; // 0x2932e0
		field public static final int P = 2800000; // 0x2ab980
		field public static final int Q = 2900000; // 0x2c4020
		field public static final int R = 3000000; // 0x2dc6c0
		field public static final int S = 3100000; // 0x2f4d60
		field public static final int S_V2 = 3200000; // 0x30d400
		field public static final int TIRAMISU = 3300000; // 0x325aa0
		field public static final int UPSIDE_DOWN_CAKE = 3400000; // 0x33e140
		field public static final int VANILLA_ICE_CREAM = 3500000; // 0x3567e0
		}

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

core/java/android/os/Build.java

+215 −0

Original line number	Diff line number	Diff line
		@@ -1278,6 +1278,41 @@ public class Build {

		/** @hide */
		@IntDef(value = {
		VERSION_CODES_FULL.BASE,
		VERSION_CODES_FULL.BASE_1_1,
		VERSION_CODES_FULL.CUPCAKE,
		VERSION_CODES_FULL.DONUT,
		VERSION_CODES_FULL.ECLAIR,
		VERSION_CODES_FULL.ECLAIR_0_1,
		VERSION_CODES_FULL.ECLAIR_MR1,
		VERSION_CODES_FULL.FROYO,
		VERSION_CODES_FULL.GINGERBREAD,
		VERSION_CODES_FULL.GINGERBREAD_MR1,
		VERSION_CODES_FULL.HONEYCOMB,
		VERSION_CODES_FULL.HONEYCOMB_MR1,
		VERSION_CODES_FULL.HONEYCOMB_MR2,
		VERSION_CODES_FULL.ICE_CREAM_SANDWICH,
		VERSION_CODES_FULL.ICE_CREAM_SANDWICH_MR1,
		VERSION_CODES_FULL.JELLY_BEAN,
		VERSION_CODES_FULL.JELLY_BEAN_MR1,
		VERSION_CODES_FULL.JELLY_BEAN_MR2,
		VERSION_CODES_FULL.KITKAT,
		VERSION_CODES_FULL.KITKAT_WATCH,
		VERSION_CODES_FULL.LOLLIPOP,
		VERSION_CODES_FULL.LOLLIPOP_MR1,
		VERSION_CODES_FULL.M,
		VERSION_CODES_FULL.N,
		VERSION_CODES_FULL.N_MR1,
		VERSION_CODES_FULL.O,
		VERSION_CODES_FULL.O_MR1,
		VERSION_CODES_FULL.P,
		VERSION_CODES_FULL.Q,
		VERSION_CODES_FULL.R,
		VERSION_CODES_FULL.S,
		VERSION_CODES_FULL.S_V2,
		VERSION_CODES_FULL.TIRAMISU,
		VERSION_CODES_FULL.UPSIDE_DOWN_CAKE,
		VERSION_CODES_FULL.VANILLA_ICE_CREAM,
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface SdkIntFull {}
		@@ -1299,6 +1334,186 @@ public class Build {
		// Use the last 5 digits for the minor version. This allows the
		// minor version to be set to CUR_DEVELOPMENT.
		private static final int SDK_INT_MULTIPLIER = 100000;

		/**
		* Android 1.0.
		*/
		public static final int BASE = VERSION_CODES.BASE * SDK_INT_MULTIPLIER;

		/**
		* Android 2.0.
		*/
		public static final int BASE_1_1 = VERSION_CODES.BASE_1_1 * SDK_INT_MULTIPLIER;

		/**
		* Android 3.0.
		*/
		public static final int CUPCAKE = VERSION_CODES.CUPCAKE * SDK_INT_MULTIPLIER;

		/**
		* Android 4.0.
		*/
		public static final int DONUT = VERSION_CODES.DONUT * SDK_INT_MULTIPLIER;

		/**
		* Android 5.0.
		*/
		public static final int ECLAIR = VERSION_CODES.ECLAIR * SDK_INT_MULTIPLIER;

		/**
		* Android 6.0.
		*/
		public static final int ECLAIR_0_1 = VERSION_CODES.ECLAIR_0_1 * SDK_INT_MULTIPLIER;

		/**
		* Android 7.0.
		*/
		public static final int ECLAIR_MR1 = VERSION_CODES.ECLAIR_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 8.0.
		*/
		public static final int FROYO = VERSION_CODES.FROYO * SDK_INT_MULTIPLIER;

		/**
		* Android 9.0.
		*/
		public static final int GINGERBREAD = VERSION_CODES.GINGERBREAD * SDK_INT_MULTIPLIER;

		/**
		* Android 10.0.
		*/
		public static final int GINGERBREAD_MR1 =
		VERSION_CODES.GINGERBREAD_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 11.0.
		*/
		public static final int HONEYCOMB = VERSION_CODES.HONEYCOMB * SDK_INT_MULTIPLIER;

		/**
		* Android 12.0.
		*/
		public static final int HONEYCOMB_MR1 = VERSION_CODES.HONEYCOMB_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 13.0.
		*/
		public static final int HONEYCOMB_MR2 = VERSION_CODES.HONEYCOMB_MR2 * SDK_INT_MULTIPLIER;

		/**
		* Android 14.0.
		*/
		public static final int ICE_CREAM_SANDWICH =
		VERSION_CODES.ICE_CREAM_SANDWICH * SDK_INT_MULTIPLIER;

		/**
		* Android 15.0.
		*/
		public static final int ICE_CREAM_SANDWICH_MR1 =
		VERSION_CODES.ICE_CREAM_SANDWICH_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 16.0.
		*/
		public static final int JELLY_BEAN = VERSION_CODES.JELLY_BEAN * SDK_INT_MULTIPLIER;

		/**
		* Android 17.0.
		*/
		public static final int JELLY_BEAN_MR1 = VERSION_CODES.JELLY_BEAN_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 18.0.
		*/
		public static final int JELLY_BEAN_MR2 = VERSION_CODES.JELLY_BEAN_MR2 * SDK_INT_MULTIPLIER;

		/**
		* Android 19.0.
		*/
		public static final int KITKAT = VERSION_CODES.KITKAT * SDK_INT_MULTIPLIER;

		/**
		* Android 20.0.
		*/
		public static final int KITKAT_WATCH = VERSION_CODES.KITKAT_WATCH * SDK_INT_MULTIPLIER;

		/**
		* Android 21.0.
		*/
		public static final int LOLLIPOP = VERSION_CODES.LOLLIPOP * SDK_INT_MULTIPLIER;

		/**
		* Android 22.0.
		*/
		public static final int LOLLIPOP_MR1 = VERSION_CODES.LOLLIPOP_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 23.0.
		*/
		public static final int M = VERSION_CODES.M * SDK_INT_MULTIPLIER;

		/**
		* Android 24.0.
		*/
		public static final int N = VERSION_CODES.N * SDK_INT_MULTIPLIER;

		/**
		* Android 25.0.
		*/
		public static final int N_MR1 = VERSION_CODES.N_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 26.0.
		*/
		public static final int O = VERSION_CODES.O * SDK_INT_MULTIPLIER;

		/**
		* Android 27.0.
		*/
		public static final int O_MR1 = VERSION_CODES.O_MR1 * SDK_INT_MULTIPLIER;

		/**
		* Android 28.0.
		*/
		public static final int P = VERSION_CODES.P * SDK_INT_MULTIPLIER;

		/**
		* Android 29.0.
		*/
		public static final int Q = VERSION_CODES.Q * SDK_INT_MULTIPLIER;

		/**
		* Android 30.0.
		*/
		public static final int R = VERSION_CODES.R * SDK_INT_MULTIPLIER;

		/**
		* Android 31.0.
		*/
		public static final int S = VERSION_CODES.S * SDK_INT_MULTIPLIER;

		/**
		* Android 32.0.
		*/
		public static final int S_V2 = VERSION_CODES.S_V2 * SDK_INT_MULTIPLIER;

		/**
		* Android 33.0.
		*/
		public static final int TIRAMISU = VERSION_CODES.TIRAMISU * SDK_INT_MULTIPLIER;

		/**
		* Android 34.0.
		*/
		public static final int UPSIDE_DOWN_CAKE =
		VERSION_CODES.UPSIDE_DOWN_CAKE * SDK_INT_MULTIPLIER;

		/**
		* Android 35.0.
		*/
		public static final int VANILLA_ICE_CREAM =
		VERSION_CODES.VANILLA_ICE_CREAM * SDK_INT_MULTIPLIER;
		}

		/**