commit 64f6b529963d1ec997cff60a79c9d249e5e09040
author Jeff Sharkey <jsharkey@android.com> Thu May 02 16:53:27 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 02 16:53:27 2013 +0000
tree b5679b2cad75df9c64e621d9ba5f2f946b569662
parent 8b9cad519ef72ed4555e9dd32ecee85c922abc32
parent b1bf9a2a0cd929130ee75a29b5f7a9f01901a0d7

Merge "Avoid NullPointerException"

ui/src/com/android/providers/downloads/ui/DownloadList.java

diff --git a/ui/src/com/android/providers/downloads/ui/DownloadList.java b/ui/src/com/android/providers/downloads/ui/DownloadList.java
index 29ea60e..db86ab7 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 @@
         // 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) {