summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2013-05-02 10:56:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-02 10:56:09 -0700
commit5fbee1e7259f99fa999cad0e69c4c75666f3de5f (patch)
treef03497df9fc4464cb7607d2ae2a405ba234a37d8 /ui
parent7db903f443405b6a0c0da48b54942426d8ed92b8 (diff)
parent672a5be2fb115a4480d6867c06b9da2a36d5353c (diff)
downloadandroid_packages_providers_DownloadProvider-5fbee1e7259f99fa999cad0e69c4c75666f3de5f.tar.gz
android_packages_providers_DownloadProvider-5fbee1e7259f99fa999cad0e69c4c75666f3de5f.tar.bz2
android_packages_providers_DownloadProvider-5fbee1e7259f99fa999cad0e69c4c75666f3de5f.zip
am 672a5be2: am 64f6b529: Merge "Avoid NullPointerException"
* commit '672a5be2fb115a4480d6867c06b9da2a36d5353c': Avoid NullPointerException
Diffstat (limited to 'ui')
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadList.java4
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) {