Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev (a9fa33b3) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -17650,7 +17650,7 @@ package android.os {
		field public static final int JELLY_BEAN = 16; // 0x10
		field public static final int JELLY_BEAN_MR1 = 17; // 0x11
		field public static final int JELLY_BEAN_MR2 = 18; // 0x12
		field public static final int KEY_LIME_PIE = 10000; // 0x2710
		field public static final int KITKAT = 10000; // 0x2710
		}

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

core/java/android/app/AlarmManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -101,7 +101,7 @@ public class AlarmManager
		mService = service;

		final int sdkVersion = ctx.getApplicationInfo().targetSdkVersion;
		mAlwaysExact = (sdkVersion < Build.VERSION_CODES.KEY_LIME_PIE);
		mAlwaysExact = (sdkVersion < Build.VERSION_CODES.KITKAT);
		}

		private long legacyExactLength() {

core/java/android/app/ContextImpl.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -726,7 +726,7 @@ class ContextImpl extends Context {
		// name. This happened to work because when we generated the file name
		// we would stringify it to "null.xml". Nice.
		if (mPackageInfo.getApplicationInfo().targetSdkVersion <
		Build.VERSION_CODES.KEY_LIME_PIE) {
		Build.VERSION_CODES.KITKAT) {
		if (name == null) {
		name = "null";
		}
		@@ -1453,7 +1453,7 @@ class ContextImpl extends Context {
		public ComponentName startServiceAsUser(Intent service, UserHandle user) {
		try {
		if (service.getComponent() == null && service.getPackage() == null) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) {
		IllegalArgumentException ex = new IllegalArgumentException(
		"Service Intent must be explicit: " + service);
		Log.e(TAG, "This will become an error", ex);
		@@ -1485,7 +1485,7 @@ class ContextImpl extends Context {
		public boolean stopServiceAsUser(Intent service, UserHandle user) {
		try {
		if (service.getComponent() == null && service.getPackage() == null) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) {
		IllegalArgumentException ex = new IllegalArgumentException(
		"Service Intent must be explicit: " + service);
		Log.e(TAG, "This will become an error", ex);
		@@ -1528,7 +1528,7 @@ class ContextImpl extends Context {
		throw new RuntimeException("Not supported in system context");
		}
		if (service.getComponent() == null && service.getPackage() == null) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KEY_LIME_PIE) {
		if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.KITKAT) {
		IllegalArgumentException ex = new IllegalArgumentException(
		"Service Intent must be explicit: " + service);
		Log.e(TAG, "This will become an error", ex);

core/java/android/content/Context.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -638,7 +638,7 @@ public abstract class Context {
		* {@sample development/samples/ApiDemos/src/com/example/android/apis/content/ExternalStorage.java
		* private_picture}
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* this path. Otherwise, {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE}
		* or {@link android.Manifest.permission#READ_EXTERNAL_STORAGE} are required.
		@@ -674,7 +674,7 @@ public abstract class Context {
		* the device, including both emulated external storage and physical media
		* slots. This does not include transient devices, such as USB flash drives.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* these paths.
		* <p>
		@@ -695,7 +695,7 @@ public abstract class Context {
		* should ensure that multiple instances running under different users don't
		* interfere with each other.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* this path. Otherwise,
		* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} or
		@@ -713,7 +713,7 @@ public abstract class Context {
		* the device, including both emulated external storage and physical media
		* slots. This does not include transient devices, such as USB flash drives.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* this path.
		* <p>
		@@ -774,7 +774,7 @@ public abstract class Context {
		* each user has their own isolated external storage. Applications only
		* have access to the external storage for the user they're running as.</p>
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* this path. Otherwise,
		* {@link android.Manifest.permission#WRITE_EXTERNAL_STORAGE} or
		@@ -799,7 +799,7 @@ public abstract class Context {
		* the device, including both emulated external storage and physical media
		* slots. This does not include transient devices, such as USB flash drives.
		* <p>
		* Starting in {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE}, no
		* Starting in {@link android.os.Build.VERSION_CODES#KITKAT}, no
		* permissions are required for the owning application to read or write to
		* these paths.
		* <p>
		@@ -1651,7 +1651,7 @@ public abstract class Context {
		* should contain either contain the complete class name of a specific service
		* implementation to start or a specific package name to target. If the
		* Intent is less specified, it will either throw an {@link IllegalArgumentException}
		* (if the caller targets {@link android.os.Build.VERSION_CODES#KEY_LIME_PIE} or later),
		* (if the caller targets {@link android.os.Build.VERSION_CODES#KITKAT} or later),
		* or which of multiple matching services it finds and uses will be undefined. If this service
		* is not already running, it will be instantiated and started (creating a
		* process for it if needed); if it is running then it remains running.

core/java/android/os/Build.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -438,7 +438,7 @@ public class Build {
		public static final int JELLY_BEAN_MR2 = 18;

		/**
		* Android X.X: Key Lime Pie, another tasty treat.
		* Android X.X: KitKat, another tasty treat.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		@@ -448,7 +448,7 @@ public class Build {
		* {@link android.content.Context#bindService}.
		* </ul>
		*/
		public static final int KEY_LIME_PIE = CUR_DEVELOPMENT;
		public static final int KITKAT = CUR_DEVELOPMENT;
		}

		/** The type of build, like "user" or "eng". */