diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-26 10:59:38 -0800 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-11-26 10:59:38 -0800 |
| commit | 2567dbb7c88ae7d41e579fe52023b231149296eb (patch) | |
| tree | 9c1b9691938d23eccedf31a96d98d8fa1e5f7865 | |
| parent | 0eaaa2d818c641b76e6d7c12898b4d64939cc4d9 (diff) | |
| download | packages_apps_ContactsCommon-2567dbb7c88ae7d41e579fe52023b231149296eb.tar.gz packages_apps_ContactsCommon-2567dbb7c88ae7d41e579fe52023b231149296eb.tar.bz2 packages_apps_ContactsCommon-2567dbb7c88ae7d41e579fe52023b231149296eb.zip | |
Fix NPE in loadInBackground
Check resolver query result before instantiating a new entity iterator.
Bug:18536624
Change-Id: Ib7d29da5a51fbe0de528029e60aeed3daab53105
| -rw-r--r-- | src/com/android/contacts/common/list/CustomContactListFilterActivity.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java index feb7df23..b3253cc3 100644 --- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java @@ -144,9 +144,12 @@ public class CustomContactListFilterActivity extends Activity 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; |