am bab9b48e: am 52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev (3182987e) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -21399,7 +21399,6 @@ package android.os {
		field public static final int JELLY_BEAN_MR2 = 18; // 0x12
		field public static final int KITKAT = 19; // 0x13
		field public static final int KITKAT_WATCH = 20; // 0x14
		field public static final int L = 21; // 0x15
		field public static final int LOLLIPOP = 21; // 0x15
		field public static final int LOLLIPOP_MR1 = 22; // 0x16
		}

core/java/android/os/Build.java

+19 −0

Original line number	Diff line number	Diff line
		@@ -554,6 +554,7 @@ public class Build {

		/**
		* Temporary until we completely switch to {@link #LOLLIPOP}.
		* @hide
		*/
		public static final int L = 21;

		@@ -566,6 +567,24 @@ public class Build {
		* <li> {@link android.content.Context#bindService Context.bindService} now
		* requires an explicit Intent, and will throw an exception if given an implicit
		* Intent.</li>
		* <li> {@link android.app.Notification.Builder Notification.Builder} will
		* not have the colors of their various notification elements adjusted to better
		* match the new material design look.</li>
		* <li> {@link android.os.Message} will validate that a message is not currently
		* in use when it is recycled.</li>
		* <li> Hardware accelerated drawing in windows will be enabled automatically
		* in most places.</li>
		* <li> {@link android.widget.Spinner} throws an exception if attaching an
		* adapter with more than one item type.</li>
		* <li> If the app is a launcher, the launcher will be available to the user
		* even when they are using corporate profiles (which requires that the app
		* use {@link android.content.pm.LauncherApps} to correctly populate its
		* apps UI).</li>
		* <li> Calling {@link android.app.Service#stopForeground Service.stopForeground}
		* with removeNotification false will modify the still posted notification so that
		* it is no longer forced to be ongoing.</li>
		* <li> A {@link android.service.dreams.DreamService} must require the
		* {@link android.Manifest.permission#BIND_DREAM_SERVICE} permission to be usable.</li>
		* </ul>
		*/
		public static final int LOLLIPOP = 21;