Merge "bug:3264401 changes to support usage of new downloads dir in /data" (a7386717) · Commits · e / os / android_frameworks_base

core/java/android/app/DownloadManager.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.database.Cursor;
		import android.database.CursorWrapper;
		import android.net.ConnectivityManager;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Environment;
		import android.os.ParcelFileDescriptor;
		import android.provider.Downloads;
		@@ -335,6 +336,7 @@ public class DownloadManager {
		private int mAllowedNetworkTypes = ~0; // default to all network types allowed
		private boolean mIsVisibleInDownloadsUi = true;
		private boolean mScannable = false;
		private boolean mUseSystemCache = false;
		/** if a file is designated as a MediaScanner scannable file, the following value is
		* stored in the database column {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.
		*/
		@@ -401,6 +403,24 @@ public class DownloadManager {
		return this;
		}

		/**
		* Set the local destination for the downloaded file to the system cache dir (/cache).
		* This is only available to System apps with the permission
		* {@link android.Manifest.permission#ACCESS_CACHE_FILESYSTEM}.
		* <p>
		* The downloaded file is not scanned by MediaScanner.
		* But it can be made scannable by calling {@link #allowScanningByMediaScanner()}.
		* <p>
		* Files downloaded to /cache may be deleted by the system at any time to reclaim space.
		*
		* @return this object
		* @hide
		*/
		public Request setDestinationToSystemCache() {
		mUseSystemCache = true;
		return this;
		}

		/**
		* Set the local destination for the downloaded file to a path within the application's
		* external files directory (as returned by {@link Context#getExternalFilesDir(String)}.
		@@ -596,6 +616,8 @@ public class DownloadManager {
		values.put(Downloads.Impl.COLUMN_FILE_NAME_HINT, mDestinationUri.toString());
		} else {
		values.put(Downloads.Impl.COLUMN_DESTINATION,
		(this.mUseSystemCache) ?
		Downloads.Impl.DESTINATION_SYSTEMCACHE_PARTITION :
		Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE);
		}
		// is the file supposed to be media-scannable?
		@@ -918,6 +940,7 @@ public class DownloadManager {
		// non-external storage for a downloaded file, then the following code
		// should also check for that destination.
		if (destination == Downloads.Impl.DESTINATION_CACHE_PARTITION \|\|
		destination == Downloads.Impl.DESTINATION_SYSTEMCACHE_PARTITION \|\|
		destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_NOROAMING \|\|
		destination == Downloads.Impl.DESTINATION_CACHE_PARTITION_PURGEABLE) {
		// return private uri

core/java/android/provider/Downloads.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -458,6 +458,13 @@ public final class Downloads {
		*/
		public static final int DESTINATION_FILE_URI = 4;

		/**
		* This download will be saved to the system cache ("/cache")
		* partition. This option is only used by system apps and so it requires
		* android.permission.ACCESS_CACHE_FILESYSTEM permission.
		*/
		public static final int DESTINATION_SYSTEMCACHE_PARTITION = 5;

		/**
		* This download is allowed to run.
		*/