diff options
| author | Tomasz Mikolajewski <mtomasz@google.com> | 2016-05-11 01:08:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-11 01:08:07 +0000 |
| commit | 79dc51840ee50f3c0ddcd68203c5f717eb5c904b (patch) | |
| tree | fda28609f627aba5dbdb19ef9049ffb9d58623c7 | |
| parent | 3ce3c9cd3d2e57c58027d353922154ac6c4ad062 (diff) | |
| parent | 6084a432033c02530aa074547d45cfda447cc56e (diff) | |
| download | android_packages_providers_DownloadProvider-79dc51840ee50f3c0ddcd68203c5f717eb5c904b.tar.gz android_packages_providers_DownloadProvider-79dc51840ee50f3c0ddcd68203c5f717eb5c904b.tar.bz2 android_packages_providers_DownloadProvider-79dc51840ee50f3c0ddcd68203c5f717eb5c904b.zip | |
Merge "Allow viewing content:// Uris from Downloads." into nyc-dev
am: 6084a43203
* commit '6084a432033c02530aa074547d45cfda447cc56e':
Allow viewing content:// Uris from Downloads.
Change-Id: Ifdfb80b7873f0d008ccc3e4252eb4f7d5f4b3d08
| -rw-r--r-- | src/com/android/providers/downloads/OpenHelper.java | 5 |
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; |