diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-09 16:23:24 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-09 16:23:24 -0700 |
| commit | 33e1ce41b46c65f679ce641d124ff9d8fce706ac (patch) | |
| tree | cc235dd58d467cf669d8b26c14fb89e9db74cab2 /ui/src/com/android/providers/downloads/ui | |
| parent | ccdd40c7230a1e82394e73d8f4c265f58095530d (diff) | |
| parent | 2435eb9c89bd46511624b9d89ab22766f82dbfcb (diff) | |
| download | android_packages_providers_DownloadProvider-33e1ce41b46c65f679ce641d124ff9d8fce706ac.tar.gz android_packages_providers_DownloadProvider-33e1ce41b46c65f679ce641d124ff9d8fce706ac.tar.bz2 android_packages_providers_DownloadProvider-33e1ce41b46c65f679ce641d124ff9d8fce706ac.zip | |
am 2435eb9c: Avoid NPE when finding common MIME type.
* commit '2435eb9c89bd46511624b9d89ab22766f82dbfcb':
Avoid NPE when finding common MIME type.
Diffstat (limited to 'ui/src/com/android/providers/downloads/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)); |