diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-11-26 10:59:38 -0800 |
|---|---|---|
| committer | Natiq Ahmed <mnatiq@codeaurora.org> | 2015-03-13 14:00:03 +0530 |
| commit | 89392e2a0569cf3b5831883cde3000af567ff020 (patch) | |
| tree | daff3907c5d2600f700f3650151fd2ec1c64f702 | |
| parent | 670a786dba56f386ea45c6bae9678f25b8d4d07b (diff) | |
| download | packages_apps_ContactsCommon-89392e2a0569cf3b5831883cde3000af567ff020.tar.gz packages_apps_ContactsCommon-89392e2a0569cf3b5831883cde3000af567ff020.tar.bz2 packages_apps_ContactsCommon-89392e2a0569cf3b5831883cde3000af567ff020.zip | |
Fix NPE in loadInBackground
Check resolver query result before instantiating a new entity iterator.
Bug:18536624
Change-Id: Ib7d29da5a51fbe0de528029e60aeed3daab53105
| -rwxr-xr-x | 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 b0bf9c3d..5066b294 100755 --- a/src/com/android/contacts/common/list/CustomContactListFilterActivity.java +++ b/src/com/android/contacts/common/list/CustomContactListFilterActivity.java @@ -148,9 +148,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; |