Merge "[pm] remove incremental startable/unstartable code" into sc-dev am: 18ecd98109 (301bec1c) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -11271,7 +11271,6 @@ package android.content {
		field public static final String EXTRA_TIMEZONE = "time-zone";
		field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";
		field public static final String EXTRA_UID = "android.intent.extra.UID";
		field public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";
		field public static final String EXTRA_USER = "android.intent.extra.USER";
		field public static final String EXTRA_USER_INITIATED = "android.intent.extra.USER_INITIATED";
		field public static final int FILL_IN_ACTION = 1; // 0x1

core/java/android/content/Intent.java

+0 −56

Original line number	Diff line number	Diff line
		@@ -2828,55 +2828,6 @@ public class Intent implements Parcelable, Cloneable {
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_MY_PACKAGE_UNSUSPENDED = "android.intent.action.MY_PACKAGE_UNSUSPENDED";

		/**
		* Broadcast Action: Sent to indicate that the package becomes startable.
		* The intent will have the following extra values:
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. </li>
		* <li> {@link #EXTRA_PACKAGE_NAME} containing the package name. </li>
		* </li>
		* </ul>
		*
		* <p class="note">This is a protected intent that can only be sent by the system.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PACKAGE_STARTABLE = "android.intent.action.PACKAGE_STARTABLE";

		/**
		* Broadcast Action: Sent to indicate that the package becomes unstartable.
		* The intent will have the following extra values:
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. </li>
		* <li> {@link #EXTRA_PACKAGE_NAME} containing the package name. </li>
		* <li> {@link #EXTRA_UNSTARTABLE_REASON} containing the integer indicating the reason for
		* the state change,
		* @see PackageManager.UnstartableReason
		* </li>
		* </ul>
		*
		* <p class="note">This is a protected intent that can only be sent by the system.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PACKAGE_UNSTARTABLE =
		"android.intent.action.PACKAGE_UNSTARTABLE";

		/**
		* Broadcast Action: Sent to indicate that the package is fully loaded.
		* <ul>
		* <li> {@link #EXTRA_UID} containing the integer uid assigned to the package. </li>
		* <li> {@link #EXTRA_PACKAGE_NAME} containing the package name. </li>
		* </li>
		* </ul>
		*
		* <p class="note">This is a protected intent that can only be sent by the system.
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String ACTION_PACKAGE_FULLY_LOADED =
		"android.intent.action.PACKAGE_FULLY_LOADED";

		/**
		* Broadcast Action: A user ID has been removed from the system. The user
		* ID number is stored in the extra data under {@link #EXTRA_UID}.
		@@ -6171,13 +6122,6 @@ public class Intent implements Parcelable, Cloneable {
		*/
		public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID";

		/**
		* Intent extra: the reason that the package associated with this intent has become unstartable.
		*
		* <p>Type: String
		*/
		public static final String EXTRA_UNSTARTABLE_REASON = "android.intent.extra.UNSTARTABLE_REASON";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Intent flags (see mFlags variable).

core/java/android/content/pm/IDataLoaderStatusListener.aidl

+0 −23

Original line number	Diff line number	Diff line
		@@ -52,30 +52,7 @@ oneway interface IDataLoaderStatusListener {
		* fail and all retry limits are exceeded. */
		const int DATA_LOADER_UNRECOVERABLE = 9;

		/** There are no known issues with the data stream. */
		const int STREAM_HEALTHY = 0;

		/** There are issues with the current transport layer (network, adb connection, etc.) that may
		* recover automatically or could eventually require user intervention. */
		const int STREAM_TRANSPORT_ERROR = 1;

		/** Integrity failures in the data stream, this could be due to file corruption, decompression
		* issues or similar. This indicates a likely unrecoverable error. */
		const int STREAM_INTEGRITY_ERROR = 2;

		/** There are issues with the source of the data, e.g., backend availability issues, account
		* issues. This indicates a potentially recoverable error, but one that may take a long time to
		* resolve. */
		const int STREAM_SOURCE_ERROR = 3;

		/** The device or app is low on storage and cannot complete the stream as a result.
		* A subsequent page miss resulting in app failure will transition app to unstartable state. */
		const int STREAM_STORAGE_ERROR = 4;

		/** Data loader status callback */
		void onStatusChanged(in int dataLoaderId, in int status);

		/** Callback to report streaming health status of a specific data loader */
		void reportStreamHealth(in int dataLoaderId, in int streamStatus);
		}

core/java/android/content/pm/IncrementalStatesInfo.java

+1 −9

Original line number	Diff line number	Diff line
		@@ -24,26 +24,19 @@ import android.os.Parcelable;
		* @hide
		*/
		public class IncrementalStatesInfo implements Parcelable {
		private boolean mIsStartable;
		private boolean mIsLoading;
		private float mProgress;

		public IncrementalStatesInfo(boolean isStartable, boolean isLoading, float progress) {
		mIsStartable = isStartable;
		public IncrementalStatesInfo(boolean isLoading, float progress) {
		mIsLoading = isLoading;
		mProgress = progress;
		}

		private IncrementalStatesInfo(Parcel source) {
		mIsStartable = source.readBoolean();
		mIsLoading = source.readBoolean();
		mProgress = source.readFloat();
		}

		public boolean isStartable() {
		return mIsStartable;
		}

		public boolean isLoading() {
		return mIsLoading;
		}
		@@ -59,7 +52,6 @@ public class IncrementalStatesInfo implements Parcelable {

		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeBoolean(mIsStartable);
		dest.writeBoolean(mIsLoading);
		dest.writeFloat(mProgress);
		}

core/java/android/content/pm/LauncherApps.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -225,7 +225,6 @@ public class LauncherApps {
		* Indicates that a package was modified in the specified profile.
		* This can happen, for example, when the package is updated or when
		* one or more components are enabled or disabled.
		* It can also happen if package state has changed, i.e., package becomes unstartable.
		*
		* @param packageName The name of the package that has changed.
		* @param user The UserHandle of the profile that generated the change.