Merge "Merge "Consistent version documentation." into sc-dev am: af2d4c8c8f... (bd88d7b1) · Commits · e / os / android_frameworks_base

core/java/android/os/Build.java

+69 −26

Original line number	Diff line number	Diff line
		@@ -441,23 +441,30 @@ public class Build {
		public static final int CUR_DEVELOPMENT = 10000;

		/**
		* October 2008: The original, first, version of Android. Yay!
		* The original, first, version of Android. Yay!
		*
		* <p>Released publicly as Android 1.0 in September 2008.
		*/
		public static final int BASE = 1;

		/**
		* February 2009: First Android update, officially called 1.1.
		* First Android update.
		*
		* <p>Released publicly as Android 1.1 in February 2009.
		*/
		public static final int BASE_1_1 = 2;

		/**
		* May 2009: Android 1.5.
		* C.
		*
		* <p>Released publicly as Android 1.5 in April 2009.
		*/
		public static final int CUPCAKE = 3;

		/**
		* September 2009: Android 1.6.
		* D.
		*
		* <p>Released publicly as Android 1.6 in September 2009.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -481,8 +488,9 @@ public class Build {
		public static final int DONUT = 4;

		/**
		* November 2009: Android 2.0
		* E.
		*
		* <p>Released publicly as Android 2.0 in October 2009.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -501,23 +509,30 @@ public class Build {
		public static final int ECLAIR = 5;

		/**
		* December 2009: Android 2.0.1
		* E incremental update.
		*
		* <p>Released publicly as Android 2.0.1 in December 2009.
		*/
		public static final int ECLAIR_0_1 = 6;

		/**
		* January 2010: Android 2.1
		* E MR1.
		*
		* <p>Released publicly as Android 2.1 in January 2010.
		*/
		public static final int ECLAIR_MR1 = 7;

		/**
		* June 2010: Android 2.2
		* F.
		*
		* <p>Released publicly as Android 2.2 in May 2010.
		*/
		public static final int FROYO = 8;

		/**
		* November 2010: Android 2.3
		* G.
		*
		* <p>Released publicly as Android 2.3 in December 2010.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -528,13 +543,16 @@ public class Build {
		public static final int GINGERBREAD = 9;

		/**
		* February 2011: Android 2.3.3.
		* G MR1.
		*
		* <p>Released publicly as Android 2.3.3 in February 2011.
		*/
		public static final int GINGERBREAD_MR1 = 10;

		/**
		* February 2011: Android 3.0.
		* H.
		*
		* <p>Released publicly as Android 3.0 in February 2011.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -573,13 +591,16 @@ public class Build {
		public static final int HONEYCOMB = 11;

		/**
		* May 2011: Android 3.1.
		* H MR1.
		*
		* <p>Released publicly as Android 3.1 in May 2011.
		*/
		public static final int HONEYCOMB_MR1 = 12;

		/**
		* June 2011: Android 3.2.
		* H MR2.
		*
		* <p>Released publicly as Android 3.2 in July 2011.
		* <p>Update to Honeycomb MR1 to support 7 inch tablets, improve
		* screen compatibility mode, etc.</p>
		*
		@@ -626,8 +647,9 @@ public class Build {
		public static final int HONEYCOMB_MR2 = 13;

		/**
		* October 2011: Android 4.0.
		* I.
		*
		* <p>Released publicly as Android 4.0 in October 2011.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -672,13 +694,16 @@ public class Build {
		public static final int ICE_CREAM_SANDWICH = 14;

		/**
		* December 2011: Android 4.0.3.
		* I MR1.
		*
		* <p>Released publicly as Android 4.03 in December 2011.
		*/
		public static final int ICE_CREAM_SANDWICH_MR1 = 15;

		/**
		* June 2012: Android 4.1.
		* J.
		*
		* <p>Released publicly as Android 4.1 in July 2012.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -720,8 +745,9 @@ public class Build {
		public static final int JELLY_BEAN = 16;

		/**
		* November 2012: Android 4.2, Moar jelly beans!
		* J MR1.
		*
		* <p>Released publicly as Android 4.2 in November 2012.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -740,13 +766,16 @@ public class Build {
		public static final int JELLY_BEAN_MR1 = 17;

		/**
		* July 2013: Android 4.3, the revenge of the beans.
		* J MR2.
		*
		* <p>Released publicly as Android 4.3 in July 2013.
		*/
		public static final int JELLY_BEAN_MR2 = 18;

		/**
		* October 2013: Android 4.4, KitKat, another tasty treat.
		* K.
		*
		* <p>Released publicly as Android 4.4 in October 2013.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/kitkat/">Android KitKat overview</a>.</p>
		@@ -778,8 +807,9 @@ public class Build {
		public static final int KITKAT = 19;

		/**
		* June 2014: Android 4.4W. KitKat for watches, snacks on the run.
		* K for watches.
		*
		* <p>Released publicly as Android 4.4W in June 2014.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		* <ul>
		@@ -796,8 +826,9 @@ public class Build {
		public static final int L = 21;

		/**
		* November 2014: Lollipop. A flat one with beautiful shadows. But still tasty.
		* L.
		*
		* <p>Released publicly as Android 5.0 in November 2014.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/lollipop/">Android Lollipop overview</a>.</p>
		@@ -828,15 +859,18 @@ public class Build {
		public static final int LOLLIPOP = 21;

		/**
		* March 2015: Lollipop with an extra sugar coating on the outside!
		* For more information about this release, see the
		* L MR1.
		*
		* <p>Released publicly as Android 5.1 in March 2015.
		* <p>For more information about this release, see the
		* <a href="/about/versions/android-5.1">Android 5.1 APIs</a>.
		*/
		public static final int LOLLIPOP_MR1 = 22;

		/**
		* M is for Marshmallow!
		* M.
		*
		* <p>Released publicly as Android 6.0 in October 2015.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/marshmallow/">Android 6.0 Marshmallow overview</a>.</p>
		@@ -867,8 +901,9 @@ public class Build {
		public static final int M = 23;

		/**
		* N is for Nougat.
		* N.
		*
		* <p>Released publicly as Android 7.0 in August 2016.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see
		* the <a href="/about/versions/nougat/">Android Nougat overview</a>.</p>
		@@ -921,7 +956,10 @@ public class Build {
		public static final int N = 24;

		/**
		* N MR1: Nougat++. For more information about this release, see
		* N MR1.
		*
		* <p>Released publicly as Android 7.1 in October 2016.
		* <p>For more information about this release, see
		* <a href="/about/versions/nougat/android-7.1">Android 7.1 for
		* Developers</a>.
		*/
		@@ -930,6 +968,7 @@ public class Build {
		/**
		* O.
		*
		* <p>Released publicly as Android 8.0 in August 2017.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see
		* the <a href="/about/versions/oreo/">Android Oreo overview</a>.</p>
		@@ -1020,6 +1059,7 @@ public class Build {
		/**
		* O MR1.
		*
		* <p>Released publicly as Android 8.1 in December 2017.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see
		* <a href="/about/versions/oreo/android-8.1">Android 8.1 features and
		@@ -1037,6 +1077,7 @@ public class Build {
		/**
		* P.
		*
		* <p>Released publicly as Android 9 in August 2018.
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior. For more information about this release, see the
		* <a href="/about/versions/pie/">Android 9 Pie overview</a>.</p>
		@@ -1054,6 +1095,7 @@ public class Build {
		/**
		* Q.
		*
		* <p>Released publicly as Android 10 in September 2019.
		* <p>Applications targeting this or a later release will get these new changes in behavior.
		* For more information about this release, see the
		* <a href="/about/versions/10">Android 10 overview</a>.</p>
		@@ -1069,6 +1111,7 @@ public class Build {
		/**
		* R.
		*
		* <p>Released publicly as Android 11 in September 2020.
		* <p>Applications targeting this or a later release will get these new changes in behavior.
		* For more information about this release, see the
		* <a href="/about/versions/11">Android 11 overview</a>.</p>