summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-17 16:55:25 -0700
committerSteve Howard <showard@google.com>2010-09-17 16:55:25 -0700
commit4bebe75b3e2361d7fb0aa966598c41c45ad9317f (patch)
tree88e70b6ea714589bba87431df1f2f64728f76e40
parent3d55d829c03fe78ad8cdab119293efb6c6e49c64 (diff)
downloadandroid_packages_providers_DownloadProvider-4bebe75b3e2361d7fb0aa966598c41c45ad9317f.tar.gz
android_packages_providers_DownloadProvider-4bebe75b3e2361d7fb0aa966598c41c45ad9317f.tar.bz2
android_packages_providers_DownloadProvider-4bebe75b3e2361d7fb0aa966598c41c45ad9317f.zip
Temporary fix to support old URIs for Market
Market has its own copies of the download manager URIs. This change bring back support for those so Market will keep working until they can properly update their code. Change-Id: I283ea65931085c0f083a182842d362c113427537
-rw-r--r--AndroidManifest.xml3
-rw-r--r--src/com/android/providers/downloads/DownloadProvider.java7
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 */