commit 574ad60004ce67e10982d2ead083c7fd95ca911e
author Makoto Onuki <omakoto@google.com> Wed Jan 11 16:48:40 2012 -0800
committer Makoto Onuki <omakoto@google.com> Thu Jan 12 13:45:12 2012 -0800
tree b028cc032d564377dc070b7e72d945190cd9a971
parent 5b39b5c38445e0b806e5dc63a2a2a5365bf339f6

Cherry-picking I25bf497e for MR1

Fix for crash in contact card with null group name

Also supress showing "null" on the group editor.

Bug 5698683
Bug 5847463

Change-Id: I25bf497e719e2beed4fac32a2913a65022fe8fc7

src/com/android/contacts/detail/ContactDetailFragment.java

diff --git a/src/com/android/contacts/detail/ContactDetailFragment.java b/src/com/android/contacts/detail/ContactDetailFragment.java
index e74f481..26d240f 100644
--- a/src/com/android/contacts/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/detail/ContactDetailFragment.java
@@ -951,7 +951,7 @@
             if (group.getGroupId() == groupId) {
                 if (!group.isDefaultGroup() && !group.isFavorites()) {
                     String title = group.getTitle();
-                    if (!groups.contains(title)) {
+                    if (!TextUtils.isEmpty(title) && !groups.contains(title)) {
                         groups.add(title);
                     }
                 }

src/com/android/contacts/editor/GroupMembershipView.java

diff --git a/src/com/android/contacts/editor/GroupMembershipView.java b/src/com/android/contacts/editor/GroupMembershipView.java
index 82acc33..ab52e0b 100644
--- a/src/com/android/contacts/editor/GroupMembershipView.java
+++ b/src/com/android/contacts/editor/GroupMembershipView.java
@@ -32,6 +32,7 @@
 import android.database.Cursor;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.provider.ContactsContract.RawContacts;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -182,10 +183,12 @@
                 if (groupId != mFavoritesGroupId && groupId != mDefaultGroupId
                         && hasMembership(groupId)) {
                     String title = mGroupMetaData.getString(GroupMetaDataLoader.TITLE);
-                    if (sb.length() != 0) {
-                        sb.append(", ");
+                    if (!TextUtils.isEmpty(title)) {
+                        if (sb.length() != 0) {
+                            sb.append(", ");
+                        }
+                        sb.append(title);
                     }
-                    sb.append(title);
                 }
             }
         }