diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-03-14 02:25:44 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-03-14 02:25:44 -0700 |
| commit | caad46fc20cde665c807d5dff02d04a257d09255 (patch) | |
| tree | daff3907c5d2600f700f3650151fd2ec1c64f702 | |
| parent | 508fcd2a3488912679b3fc8a9ecdf7a366a3a9cd (diff) | |
| parent | 89392e2a0569cf3b5831883cde3000af567ff020 (diff) | |
| download | android_packages_apps_ContactsCommon-caad46fc20cde665c807d5dff02d04a257d09255.tar.gz android_packages_apps_ContactsCommon-caad46fc20cde665c807d5dff02d04a257d09255.tar.bz2 android_packages_apps_ContactsCommon-caad46fc20cde665c807d5dff02d04a257d09255.zip | |
Merge "Fix NPE in loadInBackground"
| -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; |