diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-05-02 10:53:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-02 10:53:18 -0700 |
| commit | 672a5be2fb115a4480d6867c06b9da2a36d5353c (patch) | |
| tree | a090567795ba639a8136859b51aceb6934fb017c | |
| parent | 16961cf4cab924cf8f445d2957ecce7a5d0726b9 (diff) | |
| parent | 64f6b529963d1ec997cff60a79c9d249e5e09040 (diff) | |
| download | android_packages_providers_DownloadProvider-672a5be2fb115a4480d6867c06b9da2a36d5353c.tar.gz android_packages_providers_DownloadProvider-672a5be2fb115a4480d6867c06b9da2a36d5353c.tar.bz2 android_packages_providers_DownloadProvider-672a5be2fb115a4480d6867c06b9da2a36d5353c.zip | |
am 64f6b529: Merge "Avoid NullPointerException"
* commit '64f6b529963d1ec997cff60a79c9d249e5e09040':
Avoid NullPointerException
| -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) { |