diff options
| author | Steve Howard <showard@google.com> | 2010-09-17 19:29:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-17 19:29:30 -0700 |
| commit | e80270177d1b504525d1f4ea4139b0c213fea891 (patch) | |
| tree | 86609480b5c5574e451ed8f403c50cb83e71fdac | |
| parent | 176a74426f750dc56e7d200a4cdc3b6ed75fe6cd (diff) | |
| parent | 4bebe75b3e2361d7fb0aa966598c41c45ad9317f (diff) | |
| download | android_packages_providers_DownloadProvider-e80270177d1b504525d1f4ea4139b0c213fea891.tar.gz android_packages_providers_DownloadProvider-e80270177d1b504525d1f4ea4139b0c213fea891.tar.bz2 android_packages_providers_DownloadProvider-e80270177d1b504525d1f4ea4139b0c213fea891.zip | |
am 4bebe75b: Temporary fix to support old URIs for Market
Merge commit '4bebe75b3e2361d7fb0aa966598c41c45ad9317f' into gingerbread-plus-aosp
* commit '4bebe75b3e2361d7fb0aa966598c41c45ad9317f':
Temporary fix to support old URIs for Market
| -rw-r--r-- | AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9da6fc80..6108ac23 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -61,6 +61,9 @@ these URIs --> <path-permission android:pathPrefix="/my_downloads" android:permission="android.permission.INTERNET"/> + <!-- Temporary, for backwards compatibility --> + <path-permission android:pathPrefix="/download" + android:permission="android.permission.INTERNET"/> <!-- Apps with access to /all_downloads/... can grant permissions, allowing them to share downloaded files with other viewers --> <grant-uri-permission android:pathPrefix="/all_downloads/"/> diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 17f3d81d..edbfb783 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -39,7 +39,6 @@ import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.Process; import android.provider.Downloads; -import android.util.Config; import android.util.Log; import com.google.common.annotations.VisibleForTesting; @@ -90,6 +89,12 @@ public final class DownloadProvider extends ContentProvider { sURIMatcher.addURI("downloads", "all_downloads/#/" + Downloads.Impl.RequestHeaders.URI_SEGMENT, REQUEST_HEADERS_URI); + // temporary, for backwards compatibility + sURIMatcher.addURI("downloads", "download", MY_DOWNLOADS); + sURIMatcher.addURI("downloads", "download/#", MY_DOWNLOADS_ID); + sURIMatcher.addURI("downloads", + "download/#/" + Downloads.Impl.RequestHeaders.URI_SEGMENT, + REQUEST_HEADERS_URI); } /** Different base URIs that could be used to access an individual download */ |