commit 234e78453e7b4a3179500fa68c105bee4ad19757
author Dmitri Plotnikov <dplotnikov@google.com> Mon Nov 29 16:10:20 2010 -0800
committer Dmitri Plotnikov <dplotnikov@google.com> Mon Nov 29 16:10:20 2010 -0800
tree a1a90e0c3ea8addaf6d604cf3fb7b91a1a94b1eb
parent 56c55827a83eef9ebafbb68beb3656c2506c1e0f

Fixing NPE when a group has NULL account

Change-Id: I04c26d47b733088a11ee8c44cca59d6f9b953108

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

diff --git a/src/com/android/contacts/list/ContactListFilterLoader.java b/src/com/android/contacts/list/ContactListFilterLoader.java
index 8ad9168..72ceda0 100644
--- a/src/com/android/contacts/list/ContactListFilterLoader.java
+++ b/src/com/android/contacts/list/ContactListFilterLoader.java
@@ -57,7 +57,10 @@
         public static final int GROUP_IS_READ_ONLY = 6;
 
         private static final String SELECTION =
-                Groups.DELETED + "=0 AND " + Groups.FAVORITES + "=0";
+                Groups.DELETED + "=0" +
+                " AND " + Groups.FAVORITES + "=0" +
+                " AND " + Groups.ACCOUNT_TYPE + " NOT NULL" +
+                " AND " + Groups.ACCOUNT_NAME + " NOT NULL";
     }
 
     private boolean mStopped;

src/com/android/contacts/views/GroupMetaDataLoader.java

diff --git a/src/com/android/contacts/views/GroupMetaDataLoader.java b/src/com/android/contacts/views/GroupMetaDataLoader.java
index adfe0bf..d22b27b 100644
--- a/src/com/android/contacts/views/GroupMetaDataLoader.java
+++ b/src/com/android/contacts/views/GroupMetaDataLoader.java
@@ -41,6 +41,7 @@
     public final static int FAVORITES = 5;
 
     public GroupMetaDataLoader(Context context) {
-        super(context, Groups.CONTENT_URI, COLUMNS, null, null, null);
+        super(context, Groups.CONTENT_URI, COLUMNS, Groups.ACCOUNT_TYPE + " NOT NULL AND "
+                + Groups.ACCOUNT_NAME + " NOT NULL", null, null);
     }
 }