summaryrefslogtreecommitdiffstats
path: root/src/com/android/providers/downloads
diff options
context:
space:
mode:
authorTomasz Mikolajewski <mtomasz@google.com>2016-05-11 01:00:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-11 01:00:41 +0000
commit6084a432033c02530aa074547d45cfda447cc56e (patch)
tree05bc85b69918b325fc6d9799305ebc663f5c64db /src/com/android/providers/downloads
parent053674aa4d0ecd7e37dadb8ee37a9cafbdf2f16c (diff)
parent6bef271b9463a46cd35b6f39a0f0fd522e22fd22 (diff)
downloadandroid_packages_providers_DownloadProvider-6084a432033c02530aa074547d45cfda447cc56e.tar.gz
android_packages_providers_DownloadProvider-6084a432033c02530aa074547d45cfda447cc56e.tar.bz2
android_packages_providers_DownloadProvider-6084a432033c02530aa074547d45cfda447cc56e.zip
Merge "Allow viewing content:// Uris from Downloads." into nyc-dev
Diffstat (limited to 'src/com/android/providers/downloads')
-rw-r--r--src/com/android/providers/downloads/OpenHelper.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/providers/downloads/OpenHelper.java b/src/com/android/providers/downloads/OpenHelper.java
index 7a74c88c..27ab86b9 100644
--- a/src/com/android/providers/downloads/OpenHelper.java
+++ b/src/com/android/providers/downloads/OpenHelper.java
@@ -97,13 +97,10 @@ public class OpenHelper {
intent.putExtra(Intent.EXTRA_ORIGINATING_URI, remoteUri);
intent.putExtra(Intent.EXTRA_REFERRER, getRefererUri(context, id));
intent.putExtra(Intent.EXTRA_ORIGINATING_UID, getOriginatingUid(context, id));
- } else if ("file".equals(localUri.getScheme())) {
+ } else {
intent.setDataAndType(documentUri, mimeType);
intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION);
- } else {
- throw new UnsupportedOperationException(
- "Unsupported scheme: " + localUri.getScheme());
}
return intent;