commit 04f46aedf836e726152fc8b14d752fd58a7a7e99
author Jay Shrauner <shrauner@google.com> Wed Nov 26 10:59:38 2014 -0800
committer Jay Shrauner <shrauner@google.com> Wed Nov 26 10:59:38 2014 -0800
tree 23cdd11aa22b70de8063a032f183c44f1cc12c29
parent 7133e7c4f1897baffde0f9690c5b810b30deed91

Fix NPE in loadInBackground

Check resolver query result before instantiating a new entity iterator.

Bug:18536624
Change-Id: Ib7d29da5a51fbe0de528029e60aeed3daab53105

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;