diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-12-01 06:17:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-01 06:17:11 +0000 |
| commit | 138ea2bea97564915c25301cb71938a76da15410 (patch) | |
| tree | 55b9c0aaeb998bbc8e982a71e7d99926be8095d0 | |
| parent | 07f2d0097a23de93f6d8d215a32c0b5932c9c8b4 (diff) | |
| parent | 2567dbb7c88ae7d41e579fe52023b231149296eb (diff) | |
| download | android_packages_apps_ContactsCommon-138ea2bea97564915c25301cb71938a76da15410.tar.gz android_packages_apps_ContactsCommon-138ea2bea97564915c25301cb71938a76da15410.tar.bz2 android_packages_apps_ContactsCommon-138ea2bea97564915c25301cb71938a76da15410.zip | |
Merge "Fix NPE in loadInBackground" into lmp-mr1-dev
| -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; |