Merge "Deprecate DownloadManager.allowScanningByMediaScanner/setVisibleInDownloadsUi" into qt-dev

2 files changed, 18 insertions, 2 deletions

diff --git a/api/current.txt b/api/current.txt
index 7cc873a03267..b0452e342d0f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -4680,7 +4680,7 @@ package android.app {
   public static class DownloadManager.Request {
     ctor public DownloadManager.Request(android.net.Uri);
     method public android.app.DownloadManager.Request addRequestHeader(String, String);
-    method public void allowScanningByMediaScanner();
+    method @Deprecated public void allowScanningByMediaScanner();
     method public android.app.DownloadManager.Request setAllowedNetworkTypes(int);
     method public android.app.DownloadManager.Request setAllowedOverMetered(boolean);
     method public android.app.DownloadManager.Request setAllowedOverRoaming(boolean);
@@ -4694,7 +4694,7 @@ package android.app {
     method public android.app.DownloadManager.Request setRequiresDeviceIdle(boolean);
     method @Deprecated public android.app.DownloadManager.Request setShowRunningNotification(boolean);
     method public android.app.DownloadManager.Request setTitle(CharSequence);
-    method public android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean);
+    method @Deprecated public android.app.DownloadManager.Request setVisibleInDownloadsUi(boolean);
     field public static final int NETWORK_MOBILE = 1; // 0x1
     field public static final int NETWORK_WIFI = 2; // 0x2
     field public static final int VISIBILITY_HIDDEN = 2; // 0x2
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 6d035ddf70cb..be281c2a3efe 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -592,7 +592,15 @@ public class DownloadManager {
         /**
          * If the file to be downloaded is to be scanned by MediaScanner, this method
          * should be called before {@link DownloadManager#enqueue(Request)} is called.
+         *
+         * @deprecated Starting in Q, this value is ignored. Files downloaded to
+         * public Downloads directory (as returned by
+         * {@link Environment#getExternalStoragePublicDirectory(String)} with
+         * {@link Environment#DIRECTORY_DOWNLOADS}) will be scanned by MediaScanner
+         * and files downloaded to directories owned by applications
+         * (e.g. {@link Context#getExternalFilesDir(String)}) will not be scanned.
          */
+        @Deprecated
         public void allowScanningByMediaScanner() {
             mScannable = true;
         }
@@ -774,7 +782,15 @@ public class DownloadManager {
          * default.
          * @param isVisible whether to display this download in the Downloads UI
          * @return this object
+         *
+         * @deprecated Starting in Q, this value is ignored. Files downloaded to
+         * public Downloads directory (as returned by
+         * {@link Environment#getExternalStoragePublicDirectory(String)} with
+         * {@link Environment#DIRECTORY_DOWNLOADS}) will be visible in system's Downloads UI
+         * and files downloaded to directories owned by applications
+         * (e.g. {@link Context#getExternalFilesDir(String)}) will not be visible.
          */
+        @Deprecated
         public Request setVisibleInDownloadsUi(boolean isVisible) {
             mIsVisibleInDownloadsUi = isVisible;
             return this;