commit cfd8f96d42c25c524ff2a64f261f201a9b08fbf2
author Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 09 15:09:50 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Tue Mar 09 15:09:50 2010 -0800
tree b448a1a1bd66ba851d17ca1c5f1a58db1182539e
parent 92d77d1d08294d1ee52759ddf6501e12d3931cb5

Fixing NPE in Contact Preferences

Bug: 2497173
Change-Id: I47d816c151294bb657804a27b2fca7761f39d940

src/com/android/contacts/ui/ContactsPreferencesActivity.java

diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index 23f55c7..5fa9fc9 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -987,7 +987,9 @@
         mContactsPrefs.setSortOrder(mSortOrder);
         mContactsPrefs.setDisplayOrder(mDisplayOrder);
 
-        if (mAdapter == null) return;
+        if (mAdapter == null || mAdapter.mAccounts == null) {
+            return;
+        }
         setDisplayOnlyPhones(mDisplayPhones.isChecked());
         new UpdateTask(this).execute(mAdapter.mAccounts);
     }