Merge "Add Downloads collection in MediaProvider." (c2b34627) · Commits · e / os / android_frameworks_base

api/current.txt

+13 −0

Original line number	Diff line number	Diff line
		@@ -37397,6 +37397,17 @@ package android.provider {
		field public static final java.lang.String ENTRY_CONTENT_TYPE = "vnd.android.cursor.item/radio";
		}

		public static abstract interface MediaStore.DownloadColumns implements android.provider.MediaStore.MediaColumns {
		field public static final java.lang.String DOWNLOAD_URI = "download_uri";
		field public static final java.lang.String REFERER_URI = "referer_uri";
		}

		public static final class MediaStore.Downloads implements android.provider.MediaStore.DownloadColumns {
		method public static android.net.Uri getContentUri(java.lang.String);
		field public static final android.net.Uri EXTERNAL_CONTENT_URI;
		field public static final android.net.Uri INTERNAL_CONTENT_URI;
		}

		public static final class MediaStore.Files {
		ctor public MediaStore.Files();
		method public static android.net.Uri getContentUri(java.lang.String);
		@@ -37488,7 +37499,9 @@ package android.provider {

		public static class MediaStore.PendingParams {
		ctor public MediaStore.PendingParams(android.net.Uri, java.lang.String, java.lang.String);
		method public void setDownloadUri(android.net.Uri);
		method public void setPrimaryDirectory(java.lang.String);
		method public void setRefererUri(android.net.Uri);
		method public void setSecondaryDirectory(java.lang.String);
		}

core/java/android/provider/MediaStore.java

+110 −13

Original line number	Diff line number	Diff line
		@@ -572,6 +572,34 @@ public final class MediaStore {
		public void setSecondaryDirectory(@Nullable String secondaryDirectory) {
		this.secondaryDirectory = secondaryDirectory;
		}

		/**
		* Optionally set the Uri from where the file has been downloaded. This is used
		* for files being added to {@link Downloads} table.
		*
		* @see DownloadColumns#DOWNLOAD_URI
		*/
		public void setDownloadUri(@Nullable Uri downloadUri) {
		if (downloadUri == null) {
		this.insertValues.remove(DownloadColumns.DOWNLOAD_URI);
		} else {
		this.insertValues.put(DownloadColumns.DOWNLOAD_URI, downloadUri.toString());
		}
		}

		/**
		* Optionally set the Uri indicating HTTP referer of the file. This is used for
		* files being added to {@link Downloads} table.
		*
		* @see DownloadColumns#REFERER_URI
		*/
		public void setRefererUri(@Nullable Uri refererUri) {
		if (refererUri == null) {
		this.insertValues.remove(DownloadColumns.REFERER_URI);
		} else {
		this.insertValues.put(DownloadColumns.REFERER_URI, refererUri.toString());
		}
		}
		}

		/**
		@@ -763,7 +791,7 @@ public final class MediaStore {
		* Type: BOOLEAN
		*
		* @see MediaStore#createPending(Context, PendingParams)
		* @see MediaStore#QUERY_ARG_INCLUDE_PENDING
		* @see MediaStore#PARAM_INCLUDE_PENDING
		*/
		public static final String IS_PENDING = "is_pending";

		@@ -927,6 +955,12 @@ public final class MediaStore {
		* Constant for the {@link #MEDIA_TYPE} column indicating that file is a playlist file.
		*/
		public static final int MEDIA_TYPE_PLAYLIST = 4;

		/**
		* Column indicating if the file is part of Downloads collection.
		* @hide
		*/
		public static final String IS_DOWNLOAD = "is_download";
		}
		}

		@@ -940,6 +974,80 @@ public final class MediaStore {
		public static final Point MICRO_SIZE = new Point(96, 96);
		}

		/** Column fields for downloaded files used in {@link Downloads} table */
		public interface DownloadColumns extends MediaColumns {
		/**
		* Uri indicating where the file has been downloaded from.
		* <p>
		* Type: TEXT
		*/
		String DOWNLOAD_URI = "download_uri";

		/**
		* Uri indicating HTTP referer of {@link #DOWNLOAD_URI}.
		* <p>
		* Type: TEXT
		*/
		String REFERER_URI = "referer_uri";
		}

		/**
		* Container for downloaded files.
		*
		* <p>
		* Querying for downloads from this table will return files contributed via
		* {@link PendingSession} and also ones which were downloaded using
		* {@link android.app.DownloadManager} APIs.
		*/
		public static final class Downloads implements DownloadColumns {
		private Downloads() {}

		/**
		* The content:// style URI for the internal storage.
		*/
		public static final Uri INTERNAL_CONTENT_URI =
		getContentUri("internal");

		/**
		* The content:// style URI for the "primary" external storage
		* volume.
		*/
		public static final Uri EXTERNAL_CONTENT_URI =
		getContentUri("external");

		/**
		* Get the content:// style URI for the downloads table on the
		* given volume.
		*
		* @param volumeName the name of the volume to get the URI for
		* @return the URI to the image media table on the given volume
		*/
		public static Uri getContentUri(String volumeName) {
		return AUTHORITY_URI.buildUpon().appendPath(volumeName)
		.appendPath("downloads").build();
		}

		/** @hide */
		public static Uri getContentUriForPath(@NonNull String path) {
		return getContentUri(getVolumeNameForPath(path));
		}
		}

		private static String getVolumeNameForPath(@NonNull String path) {
		final StorageManager sm = AppGlobals.getInitialApplication()
		.getSystemService(StorageManager.class);
		final StorageVolume sv = sm.getStorageVolume(new File(path));
		if (sv != null) {
		if (sv.isPrimary()) {
		return VOLUME_EXTERNAL;
		} else {
		return sv.getUuid();
		}
		} else {
		return VOLUME_INTERNAL;
		}
		}

		/**
		* This class is used internally by Images.Thumbnails and Video.Thumbnails, it's not intended
		* to be accessed elsewhere.
		@@ -1671,18 +1779,7 @@ public final class MediaStore {
		* access this path.
		*/
		public static @Nullable Uri getContentUriForPath(@NonNull String path) {
		final StorageManager sm = AppGlobals.getInitialApplication()
		.getSystemService(StorageManager.class);
		final StorageVolume sv = sm.getStorageVolume(new File(path));
		if (sv != null) {
		if (sv.isPrimary()) {
		return EXTERNAL_CONTENT_URI;
		} else {
		return getContentUri(sv.getUuid());
		}
		} else {
		return INTERNAL_CONTENT_URI;
		}
		return getContentUri(getVolumeNameForPath(path));
		}

		/**