summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEddie Ringle <eddie@eringle.net>2010-04-24 16:41:37 -0400
committerEddie Ringle <eddie@eringle.net>2010-04-24 16:41:37 -0400
commit9d28a183ff6eaa91f283b00b449250c2f711c780 (patch)
tree973b8e82ca6fe637417f664364c51ef1cd134e01
parent1a3eb08c9bbec308813db4349ecbac8b2b9d0cc5 (diff)
downloadandroid_packages_providers_DownloadProvider-9d28a183ff6eaa91f283b00b449250c2f711c780.tar.gz
android_packages_providers_DownloadProvider-9d28a183ff6eaa91f283b00b449250c2f711c780.tar.bz2
android_packages_providers_DownloadProvider-9d28a183ff6eaa91f283b00b449250c2f711c780.zip
Allow any file type to be downloaded
Signed-off-by: Eddie Ringle <eddie@eringle.net>
-rw-r--r--src/com/android/providers/downloads/DownloadService.java37
-rw-r--r--src/com/android/providers/downloads/Helpers.java25
2 files changed, 0 insertions, 62 deletions
diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java
index 36e8eb09..a022ffa7 100644
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -608,43 +608,6 @@ public class DownloadService extends Service {
mDownloads.add(arrayPos, info);
- if (info.mStatus == 0
- && (info.mDestination == Downloads.DESTINATION_EXTERNAL
- || info.mDestination == Downloads.DESTINATION_CACHE_PARTITION_PURGEABLE)
- && info.mMimeType != null
- && !DrmRawContent.DRM_MIMETYPE_MESSAGE_STRING.equalsIgnoreCase(info.mMimeType)) {
- // Check to see if we are allowed to download this file. Only files
- // that can be handled by the platform can be downloaded.
- // special case DRM files, which we should always allow downloading.
- Intent mimetypeIntent = new Intent(Intent.ACTION_VIEW);
-
- // We can provide data as either content: or file: URIs,
- // so allow both. (I think it would be nice if we just did
- // everything as content: URIs)
- // Actually, right now the download manager's UId restrictions
- // prevent use from using content: so it's got to be file: or
- // nothing
-
- mimetypeIntent.setDataAndType(Uri.fromParts("file", "", null), info.mMimeType);
- ResolveInfo ri = getPackageManager().resolveActivity(mimetypeIntent,
- PackageManager.MATCH_DEFAULT_ONLY);
- //Log.i(Constants.TAG, "*** QUERY " + mimetypeIntent + ": " + list);
-
- if (ri == null) {
- if (Config.LOGD) {
- Log.d(Constants.TAG, "no application to handle MIME type " + info.mMimeType);
- }
- info.mStatus = Downloads.STATUS_NOT_ACCEPTABLE;
-
- Uri uri = ContentUris.withAppendedId(Downloads.CONTENT_URI, info.mId);
- ContentValues values = new ContentValues();
- values.put(Downloads.COLUMN_STATUS, Downloads.STATUS_NOT_ACCEPTABLE);
- getContentResolver().update(uri, values, null, null);
- info.sendIntentIfRequested(uri, this);
- return;
- }
- }
-
if (info.canUseNetwork(networkAvailable, networkRoaming)) {
if (info.isReadyToStart(now)) {
if (Constants.LOGV) {
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index d8f262c7..7451a07c 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -99,31 +99,6 @@ public class Helpers {
}
return new DownloadFileInfo(null, null, Downloads.STATUS_NOT_ACCEPTABLE);
}
- if (!DrmRawContent.DRM_MIMETYPE_MESSAGE_STRING.equalsIgnoreCase(mimeType)) {
- // Check to see if we are allowed to download this file. Only files
- // that can be handled by the platform can be downloaded.
- // special case DRM files, which we should always allow downloading.
- Intent intent = new Intent(Intent.ACTION_VIEW);
-
- // We can provide data as either content: or file: URIs,
- // so allow both. (I think it would be nice if we just did
- // everything as content: URIs)
- // Actually, right now the download manager's UId restrictions
- // prevent use from using content: so it's got to be file: or
- // nothing
-
- PackageManager pm = context.getPackageManager();
- intent.setDataAndType(Uri.fromParts("file", "", null), mimeType);
- ResolveInfo ri = pm.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY);
- //Log.i(Constants.TAG, "*** FILENAME QUERY " + intent + ": " + list);
-
- if (ri == null) {
- if (Config.LOGD) {
- Log.d(Constants.TAG, "no handler found for type " + mimeType);
- }
- return new DownloadFileInfo(null, null, Downloads.STATUS_NOT_ACCEPTABLE);
- }
- }
}
String filename = chooseFilename(
url, hint, contentDisposition, contentLocation, destination);