diff options
author | Jeff Sharkey <jsharkey@android.com> | 2012-04-19 10:10:53 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2012-04-19 20:41:51 -0700 |
commit | c3f3d992e415185a8e2d89ab8f8dfbcb538ec21e (patch) | |
tree | 2e08d79b3f5c1926e91364f0f17df5ae226d2f9d /src/com/android/providers/downloads/DownloadProvider.java | |
parent | a7ae77fdae69bcc6d6609d4639fed5d96e55eeaa (diff) | |
download | android_packages_providers_DownloadProvider-c3f3d992e415185a8e2d89ab8f8dfbcb538ec21e.tar.gz android_packages_providers_DownloadProvider-c3f3d992e415185a8e2d89ab8f8dfbcb538ec21e.tar.bz2 android_packages_providers_DownloadProvider-c3f3d992e415185a8e2d89ab8f8dfbcb538ec21e.zip |
Report MIME type for individual downloads.
Bug: 6358473
Change-Id: Ied4a6c8194d0cbb735e43cf7d7759f4674efe535
Diffstat (limited to 'src/com/android/providers/downloads/DownloadProvider.java')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 5fbe42a5..40ebd2bb 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -39,6 +39,7 @@ import android.os.ParcelFileDescriptor; import android.os.Process; import android.provider.Downloads; import android.provider.OpenableColumns; +import android.text.TextUtils; import android.util.Log; import com.google.android.collect.Maps; @@ -55,7 +56,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; - /** * Allows application to interact with the download manager. */ @@ -463,17 +463,20 @@ public final class DownloadProvider extends ContentProvider { return DOWNLOAD_LIST_TYPE; } case MY_DOWNLOADS_ID: - case ALL_DOWNLOADS_ID: { - return DOWNLOAD_TYPE; - } + case ALL_DOWNLOADS_ID: case PUBLIC_DOWNLOAD_ID: { // return the mimetype of this id from the database final String id = getDownloadIdFromUri(uri); final SQLiteDatabase db = mOpenHelper.getReadableDatabase(); - return DatabaseUtils.stringForQuery(db, + final String mimeType = DatabaseUtils.stringForQuery(db, "SELECT " + Downloads.Impl.COLUMN_MIME_TYPE + " FROM " + DB_TABLE + " WHERE " + Downloads.Impl._ID + " = ?", new String[]{id}); + if (TextUtils.isEmpty(mimeType)) { + return DOWNLOAD_TYPE; + } else { + return mimeType; + } } default: { if (Constants.LOGV) { |