Merge "Download: add to support pause/resume download by manual" (f73fa6c5) · Commits · e / os / android_frameworks_base

core/java/android/app/DownloadManager.java

100644 → 100755

+40 −0

Original line number	Diff line number	Diff line
		@@ -266,6 +266,13 @@ public class DownloadManager {
		*/
		public final static int PAUSED_UNKNOWN = 4;

		/**
		* Value of {@link #COLUMN_REASON} when the download is paused by manual.
		*
		* @hide
		*/
		public final static int PAUSED_BY_MANUAL = 5;

		/**
		* Broadcast intent action sent by the download manager when a download completes.
		*/
		@@ -865,6 +872,7 @@ public class DownloadManager {
		parts.add(statusClause("=", Downloads.Impl.STATUS_WAITING_TO_RETRY));
		parts.add(statusClause("=", Downloads.Impl.STATUS_WAITING_FOR_NETWORK));
		parts.add(statusClause("=", Downloads.Impl.STATUS_QUEUED_FOR_WIFI));
		parts.add(statusClause("=", Downloads.Impl.STATUS_PAUSED_BY_MANUAL));
		}
		if ((mStatusFlags & STATUS_SUCCESSFUL) != 0) {
		parts.add(statusClause("=", Downloads.Impl.STATUS_SUCCESS));
		@@ -1124,6 +1132,34 @@ public class DownloadManager {
		mResolver.update(mBaseUri, values, getWhereClauseForIds(ids), getWhereArgsForIds(ids));
		}

		/**
		* Pause the given running download by manual.
		*
		* @param id the ID of the download to be paused
		* @return the number of downloads actually updated
		* @hide
		*/
		public int pauseDownload(long id) {
		ContentValues values = new ContentValues();
		values.put(Downloads.Impl.COLUMN_STATUS, Downloads.Impl.STATUS_PAUSED_BY_MANUAL);

		return mResolver.update(ContentUris.withAppendedId(mBaseUri, id), values, null, null);
		}

		/**
		* Resume the given paused download by manual.
		*
		* @param id the ID of the download to be resumed
		* @return the number of downloads actually updated
		* @hide
		*/
		public int resumeDownload(long id) {
		ContentValues values = new ContentValues();
		values.put(Downloads.Impl.COLUMN_STATUS, Downloads.Impl.STATUS_RUNNING);

		return mResolver.update(ContentUris.withAppendedId(mBaseUri, id), values, null, null);
		}

		/**
		* Returns maximum size, in bytes, of downloads that may go over a mobile connection; or null if
		* there's no limit
		@@ -1360,6 +1396,9 @@ public class DownloadManager {
		case Downloads.Impl.STATUS_QUEUED_FOR_WIFI:
		return PAUSED_QUEUED_FOR_WIFI;

		case Downloads.Impl.STATUS_PAUSED_BY_MANUAL:
		return PAUSED_BY_MANUAL;

		default:
		return PAUSED_UNKNOWN;
		}
		@@ -1415,6 +1454,7 @@ public class DownloadManager {
		case Downloads.Impl.STATUS_WAITING_TO_RETRY:
		case Downloads.Impl.STATUS_WAITING_FOR_NETWORK:
		case Downloads.Impl.STATUS_QUEUED_FOR_WIFI:
		case Downloads.Impl.STATUS_PAUSED_BY_MANUAL:
		return STATUS_PAUSED;

		case Downloads.Impl.STATUS_SUCCESS:

core/java/android/provider/Downloads.java

100644 → 100755

+5 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,11 @@ public final class Downloads {
		*/
		public static final int STATUS_QUEUED_FOR_WIFI = 196;

		/**
		* This download is paused by manual.
		*/
		public static final int STATUS_PAUSED_BY_MANUAL = 197;

		/**
		* This download couldn't be completed due to insufficient storage
		* space. Typically, this is because the SD card is full.