commit 9665187a0075f22511bd9f56d435f65f95346254
author Dmitri Plotnikov <dplotnikov@google.com> Thu Oct 07 10:52:41 2010 -0700
committer Dmitri Plotnikov <dplotnikov@google.com> Thu Oct 07 10:52:41 2010 -0700
tree 6d7d9f03a0a46842336660f12532a6f298635022
parent 1fafec94496cba4c19db418dc716fcfe70c9f809

Fixing NPE in ContactListFilterController

Bug: 3071711
Change-Id: I820e32250e2699e86754b5302bddee3131a4c6e5

src/com/android/contacts/list/ContactListFilterController.java

diff --git a/src/com/android/contacts/list/ContactListFilterController.java b/src/com/android/contacts/list/ContactListFilterController.java
index 051c9a0..8bcd488 100644
--- a/src/com/android/contacts/list/ContactListFilterController.java
+++ b/src/com/android/contacts/list/ContactListFilterController.java
@@ -282,7 +282,7 @@
     }
 
     private ContactListFilter getDefaultFilter() {
-        return mFilters.valueAt(0);
+        return mFilters.size() > 0 ? mFilters.valueAt(0) : null;
     }
 
     protected void updateFilterView() {

src/com/android/contacts/list/ContactListFilterView.java

diff --git a/src/com/android/contacts/list/ContactListFilterView.java b/src/com/android/contacts/list/ContactListFilterView.java
index 744de05..c9a0472 100644
--- a/src/com/android/contacts/list/ContactListFilterView.java
+++ b/src/com/android/contacts/list/ContactListFilterView.java
@@ -58,6 +58,12 @@
             mIndentedLabel = (TextView) findViewById(R.id.indented_label);
         }
 
+        if (mFilter == null) {
+            mLabel.setText(R.string.contactsList);
+            mLabel.setVisibility(View.VISIBLE);
+            return;
+        }
+
         switch (mFilter.filterType) {
             case ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS: {
                 if (mIcon != null) {