diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-02 16:53:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-05-02 16:53:27 +0000 |
| commit | 64f6b529963d1ec997cff60a79c9d249e5e09040 (patch) | |
| tree | b5679b2cad75df9c64e621d9ba5f2f946b569662 /ui | |
| parent | 8b9cad519ef72ed4555e9dd32ecee85c922abc32 (diff) | |
| parent | b1bf9a2a0cd929130ee75a29b5f7a9f01901a0d7 (diff) | |
| download | android_packages_providers_DownloadProvider-64f6b529963d1ec997cff60a79c9d249e5e09040.tar.gz android_packages_providers_DownloadProvider-64f6b529963d1ec997cff60a79c9d249e5e09040.tar.bz2 android_packages_providers_DownloadProvider-64f6b529963d1ec997cff60a79c9d249e5e09040.zip | |
Merge "Avoid NullPointerException"
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 29ea60eb..db86ab7e 100644 --- a/ui/src/com/android/providers/downloads/ui/DownloadList.java +++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java @@ -765,7 +765,9 @@ public class DownloadList extends Activity { // are all prefixes of the given mimetypes the same? ArrayList<String> mimeTypePrefixes = new ArrayList<String>(); for (String s : mimeTypes) { - mimeTypePrefixes.add(s.substring(0, s.indexOf('/'))); + if (s != null) { + mimeTypePrefixes.add(s.substring(0, s.indexOf('/'))); + } } str = findCommonString(mimeTypePrefixes); if (str != null) { |