diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-09 16:28:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-09 16:28:28 -0700 |
| commit | 8fcad502820b507a31ebd832d7db3480f34affb6 (patch) | |
| tree | d3baa10472ad95dfcc8541ed057ed9e9961b18f4 /ui | |
| parent | 3ecb321aedf014378a4dcfab90765800034ede64 (diff) | |
| parent | 33e1ce41b46c65f679ce641d124ff9d8fce706ac (diff) | |
| download | android_packages_providers_DownloadProvider-8fcad502820b507a31ebd832d7db3480f34affb6.tar.gz android_packages_providers_DownloadProvider-8fcad502820b507a31ebd832d7db3480f34affb6.tar.bz2 android_packages_providers_DownloadProvider-8fcad502820b507a31ebd832d7db3480f34affb6.zip | |
am 33e1ce41: am 2435eb9c: Avoid NPE when finding common MIME type.
* commit '33e1ce41b46c65f679ce641d124ff9d8fce706ac':
Avoid NPE when finding common MIME type.
Diffstat (limited to 'ui')
| -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 db86ab7e..05b5d757 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -734,7 +734,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)); |