commit 288ae10f86a4a42bd5541d24b12a860db51899c5
author Jay Shrauner <shrauner@google.com> Mon Dec 01 06:17:10 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 06:17:11 2014 +0000
tree 8474851b2da380ff3db0aa3f27ca410da925d4c6
parent e4c2e469bfcefc03319b843ad4335830414b6bdd
parent 04f46aedf836e726152fc8b14d752fd58a7a7e99

Merge "Fix NPE in loadInBackground" into lmp-mr1-dev

src/com/android/contacts/common/list/CustomContactListFilterActivity.java

diff --git a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java
index feb7df2..b3253cc 100644
--- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java
@@ -144,9 +144,12 @@
                 if (account.dataSet != null) {
                     groupsUri.appendQueryParameter(Groups.DATA_SET, account.dataSet).build();
                 }
+                final Cursor cursor = resolver.query(groupsUri.build(), null, null, null, null);
+                if (cursor == null) {
+                    continue;
+                }
                 android.content.EntityIterator iterator =
-                        ContactsContract.Groups.newEntityIterator(resolver.query(
-                        groupsUri.build(), null, null, null, null));
+                        ContactsContract.Groups.newEntityIterator(cursor);
                 try {
                     boolean hasGroups = false;