Merge "Deprecate DownloadManager.addCompletedDownload." into qt-dev
diff --git a/api/current.txt b/api/current.txt
index f62c689..13ebbb0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4622,8 +4622,8 @@
}
public class DownloadManager {
- method public long addCompletedDownload(String, String, boolean, String, String, long, boolean);
- method public long addCompletedDownload(String, String, boolean, String, String, long, boolean, android.net.Uri, android.net.Uri);
+ method @Deprecated public long addCompletedDownload(String, String, boolean, String, String, long, boolean);
+ method @Deprecated public long addCompletedDownload(String, String, boolean, String, String, long, boolean, android.net.Uri, android.net.Uri);
method public long enqueue(android.app.DownloadManager.Request);
method public static Long getMaxBytesOverMobile(android.content.Context);
method public String getMimeTypeForDownloadedFile(long);
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 6073354..6d035dd 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -1366,7 +1366,12 @@
* @param showNotification true if a notification is to be sent, false otherwise
* @return an ID for the download entry added to the downloads app, unique across the system
* This ID is used to make future calls related to this download.
+ *
+ * @deprecated Apps should instead contribute files to
+ * {@link android.provider.MediaStore.Downloads} collection to make them available to user
+ * as part of Downloads.
*/
+ @Deprecated
public long addCompletedDownload(String title, String description,
boolean isMediaScannerScannable, String mimeType, String path, long length,
boolean showNotification) {
@@ -1407,7 +1412,12 @@
* @param referer the HTTP Referer for the download
* @return an ID for the download entry added to the downloads app, unique across the system
* This ID is used to make future calls related to this download.
+ *
+ * @deprecated Apps should instead contribute files to
+ * {@link android.provider.MediaStore.Downloads} collection to make them available to user
+ * as part of Downloads.
*/
+ @Deprecated
public long addCompletedDownload(String title, String description,
boolean isMediaScannerScannable, String mimeType, String path, long length,
boolean showNotification, Uri uri, Uri referer) {
@@ -1426,8 +1436,13 @@
* {@link Environment#getExternalStoragePublicDirectory(String)} with
* {@link Environment#DIRECTORY_DOWNLOADS}).
*
+ * @deprecated Apps should instead contribute files to
+ * {@link android.provider.MediaStore.Downloads} collection to make them available to user
+ * as part of Downloads.
+ *
* {@hide}
*/
+ @Deprecated
public long addCompletedDownload(String title, String description,
boolean isMediaScannerScannable, String mimeType, String path, long length,
boolean showNotification, boolean allowWrite) {
@@ -1447,7 +1462,12 @@
* {@link Environment#DIRECTORY_DOWNLOADS}).
*
* {@hide}
+ *
+ * @deprecated Apps should instead contribute files to
+ * {@link android.provider.MediaStore.Downloads} collection to make them available to user
+ * as part of Downloads.
*/
+ @Deprecated
public long addCompletedDownload(String title, String description,
boolean isMediaScannerScannable, String mimeType, String path, long length,
boolean showNotification, boolean allowWrite, Uri uri, Uri referer) {