diff options
author | Jeff Sharkey <jsharkey@android.com> | 2013-05-09 13:46:37 -0700 |
---|---|---|
committer | Jeff Sharkey <jsharkey@android.com> | 2013-05-09 13:46:37 -0700 |
commit | 2435eb9c89bd46511624b9d89ab22766f82dbfcb (patch) | |
tree | db0d94110b14a79948e4a782460ff2b187f5c53c /ui/src/com/android/providers/downloads | |
parent | 64a9e6cb3628db724e04492cf207757348960eb7 (diff) | |
download | android_packages_providers_DownloadProvider-2435eb9c89bd46511624b9d89ab22766f82dbfcb.tar.gz android_packages_providers_DownloadProvider-2435eb9c89bd46511624b9d89ab22766f82dbfcb.tar.bz2 android_packages_providers_DownloadProvider-2435eb9c89bd46511624b9d89ab22766f82dbfcb.zip |
Avoid NPE when finding common MIME type.
Bug: 8609148
Change-Id: Ibd1121d6833981234acdc927010087c12913e33d
Diffstat (limited to 'ui/src/com/android/providers/downloads')
-rw-r--r-- | ui/src/com/android/providers/downloads/ui/DownloadList.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java index ed369932..fd000d3c 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -732,7 +732,9 @@ public class DownloadList extends Activity { Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, item.getKey()); final String mimeType = item.getValue().getMimeType(); attachments.add(uri); - mimeTypes.add(mimeType); + if (mimeType != null) { + mimeTypes.add(mimeType); + } } intent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, attachments); intent.setType(findCommonMimeType(mimeTypes)); |