commit c3d8750bdfe07f7440a44509fa10d268ad266f18
author Dave Santoro <dsantoro@google.com> Thu Aug 04 15:58:45 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 04 15:58:45 2011 -0700
tree f42be779b2d71fc0b6bc1ca078e82f24a31b6862
parent de6d3386dc954815f8f7e6287feba6622ff7d6eb
parent 73ab23683ed8ac24a6f429dcce50c54bbeae4987

Merge "Fix custom list filter for groups."

src/com/android/contacts/list/CustomContactListFilterActivity.java

diff --git a/src/com/android/contacts/list/CustomContactListFilterActivity.java b/src/com/android/contacts/list/CustomContactListFilterActivity.java
index ae21824..e0965cc 100644
--- a/src/com/android/contacts/list/CustomContactListFilterActivity.java
+++ b/src/com/android/contacts/list/CustomContactListFilterActivity.java
@@ -128,12 +128,14 @@
                 AccountDisplay accountDisplay =
                         new AccountDisplay(resolver, account.name, account.type, account.dataSet);
 
-                final Uri groupsUri = Groups.CONTENT_URI.buildUpon()
+                final Uri.Builder groupsUri = Groups.CONTENT_URI.buildUpon()
                         .appendQueryParameter(Groups.ACCOUNT_NAME, account.name)
-                        .appendQueryParameter(Groups.ACCOUNT_TYPE, account.type)
-                        .appendQueryParameter(Groups.DATA_SET, account.dataSet).build();
+                        .appendQueryParameter(Groups.ACCOUNT_TYPE, account.type);
+                if (account.dataSet != null) {
+                    groupsUri.appendQueryParameter(Groups.DATA_SET, account.dataSet).build();
+                }
                 EntityIterator iterator = ContactsContract.Groups.newEntityIterator(resolver.query(
-                        groupsUri, null, null, null, null));
+                        groupsUri.build(), null, null, null, null));
                 try {
                     boolean hasGroups = false;