summaryrefslogtreecommitdiffstats
path: root/ui/src
diff options
context:
space:
mode:
Diffstat (limited to 'ui/src')
-rw-r--r--ui/src/com/android/providers/downloads/ui/DownloadList.java6
1 files changed, 5 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 fd000d3c..05b5d757 100644
--- a/ui/src/com/android/providers/downloads/ui/DownloadList.java
+++ b/ui/src/com/android/providers/downloads/ui/DownloadList.java
@@ -431,8 +431,10 @@ public class DownloadList extends Activity {
if (mDateSortedCursor == null || mDateSortedCursor.getCount() == 0) {
mEmptyView.setVisibility(View.VISIBLE);
+ mSortOption.setVisibility(View.GONE);
} else {
mEmptyView.setVisibility(View.GONE);
+ mSortOption.setVisibility(View.VISIBLE);
ListView lv = activeListView();
lv.setVisibility(View.VISIBLE);
lv.invalidateViews(); // ensure checkboxes get updated
@@ -765,7 +767,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) {