Update DownloadStorageProvider to include MediaStore.Downloads.

Bug: 120879205
Test: manual
Test: atest DownloadProviderTests
Test: atest cts/tests/app/src/android/app/cts/DownloadManagerTest.java
Test: atest MediaProviderTests
Test: atest cts/tests/tests/provider/src/android/provider/cts/MediaStore*
Change-Id: Ief04f55614d34ba3c8a094fbd1ede34d4fef930b

1 files changed, 13 insertions, 1 deletions

diff --git a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
index 54060747..b3c08131 100644
--- a/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
+++ b/ui/src/com/android/providers/downloads/ui/TrampolineActivity.java
@@ -23,7 +23,6 @@ import android.app.DialogFragment;
 import android.app.DownloadManager;
 import android.app.DownloadManager.Query;
 import android.app.FragmentManager;
-import android.content.ActivityNotFoundException;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -36,6 +35,7 @@ import android.util.Log;
 import android.widget.Toast;
 
 import com.android.providers.downloads.Constants;
+import com.android.providers.downloads.MediaStoreDownloadsHelper;
 import com.android.providers.downloads.OpenHelper;
 import com.android.providers.downloads.RawDocumentsHelper;
 
@@ -67,6 +67,18 @@ public class TrampolineActivity extends Activity {
             return;
         }
 
+        if (MediaStoreDownloadsHelper.isMediaStoreDownload(
+                DocumentsContract.getDocumentId(documentUri))) {
+            final Intent intent = OpenHelper.buildViewIntentForMediaStoreDownload(
+                    this, documentUri);
+            if (intent == null || !OpenHelper.startViewIntent(this, intent)) {
+                Toast.makeText(this, R.string.download_no_application_title, Toast.LENGTH_SHORT)
+                        .show();
+            }
+            finish();
+            return;
+        }
+
         final long id = ContentUris.parseId(documentUri);
         final DownloadManager dm = (DownloadManager) getSystemService(Context.DOWNLOAD_SERVICE);
         dm.setAccessAllDownloads(true);