Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 574ad600 authored by Makoto Onuki's avatar Makoto Onuki
Browse files

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
parent 5b39b5c3

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

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ public class ContactDetailFragment extends Fragment implements FragmentKeyListen 
            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

+6 −3
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.content.res.Resources; 
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,6 +183,7 @@ public class GroupMembershipView extends LinearLayout 
                if (groupId != mFavoritesGroupId && groupId != mDefaultGroupId

                        && hasMembership(groupId)) {

                    String title = mGroupMetaData.getString(GroupMetaDataLoader.TITLE);

                    if (!TextUtils.isEmpty(title)) {

                        if (sb.length() != 0) {

                            sb.append(", ");

                        }
@@ -189,6 +191,7 @@ public class GroupMembershipView extends LinearLayout 
                    }

                }

            }

        }



        if (!accountHasGroups) {

            setVisibility(GONE);