summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTomasz Mikolajewski <mtomasz@google.com>2016-02-03 03:58:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-02-03 03:58:02 +0000
commit22661eca3eb3dd1931829c3e92b4b5ed9cb7a20a (patch)
treef67b7b9a2e8cc37587c42eda46614f7fbc1439ec /src
parentfe20efab34878afca17f117734389559e4e526fb (diff)
parent3b4301a153221814ded7e76208e7b93b8f19e9b2 (diff)
downloadandroid_packages_providers_DownloadProvider-22661eca3eb3dd1931829c3e92b4b5ed9cb7a20a.tar.gz
android_packages_providers_DownloadProvider-22661eca3eb3dd1931829c3e92b4b5ed9cb7a20a.tar.bz2
android_packages_providers_DownloadProvider-22661eca3eb3dd1931829c3e92b4b5ed9cb7a20a.zip
Merge "Migrate the DownloadProvider's trampoline to use SAF Uris."
Diffstat (limited to 'src')
-rw-r--r--src/com/android/providers/downloads/OpenHelper.java11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java
index 8124df97..7a74c88c 100644
--- a/src/com/android/providers/downloads/OpenHelper.java
+++ b/src/com/android/providers/downloads/OpenHelper.java
@@ -31,6 +31,7 @@ import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.os.StrictMode;
+import android.provider.DocumentsContract;
import android.provider.Downloads.Impl.RequestHeaders;
import android.util.Log;
@@ -82,6 +83,9 @@ public class OpenHelper {
String mimeType = getCursorString(cursor, COLUMN_MEDIA_TYPE);
mimeType = DownloadDrmHelper.getOriginalMimeType(context, file, mimeType);
+ final Uri documentUri = DocumentsContract.buildDocumentUri(
+ Constants.STORAGE_AUTHORITY, String.valueOf(id));
+
final Intent intent = new Intent(Intent.ACTION_VIEW);
if ("application/vnd.android.package-archive".equals(mimeType)) {
@@ -94,13 +98,12 @@ public class OpenHelper {
intent.putExtra(Intent.EXTRA_REFERRER, getRefererUri(context, id));
intent.putExtra(Intent.EXTRA_ORIGINATING_UID, getOriginatingUid(context, id));
} else if ("file".equals(localUri.getScheme())) {
+ intent.setDataAndType(documentUri, mimeType);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
- intent.setDataAndType(
- ContentUris.withAppendedId(ALL_DOWNLOADS_CONTENT_URI, id), mimeType);
} else {
- intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
- intent.setDataAndType(localUri, mimeType);
+ throw new UnsupportedOperationException(
+ "Unsupported scheme: " + localUri.getScheme());
}
return intent;