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

Commit ba482b6c authored by Makoto Onuki's avatar Makoto Onuki Committed by Android (Google) Code Review
Browse files

Merge "Fix group editor crash (IndexOutOfBoundsException)"

parents f4ca033f 59b46720

src/com/android/contacts/group/GroupEditorFragment.java

+4 −1
Original line number Diff line number Diff line
@@ -404,7 +404,10 @@ public class GroupEditorFragment extends Fragment implements SelectAccountDialog 
            mAutoCompleteTextView.setOnItemClickListener(new OnItemClickListener() {

                @Override

                public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

                    SuggestedMember member = mAutoCompleteAdapter.getItem(position);

                    SuggestedMember member = (SuggestedMember) view.getTag();

                    if (member == null) {

                        return; // just in case

                    }

                    loadMemberToAddToGroup(member.getRawContactId(),

                            String.valueOf(member.getContactId()));

src/com/android/contacts/group/SuggestedMemberListAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -144,11 +144,11 @@ public class SuggestedMemberListAdapter extends ArrayAdapter<SuggestedMember> { 
        byte[] byteArray = member.getPhotoByteArray();

        if (byteArray == null) {

            icon.setImageResource(R.drawable.ic_contact_picture);

        }

        else {

        } else {

            Bitmap bitmap = BitmapFactory.decodeByteArray(byteArray, 0, byteArray.length);

            icon.setImageBitmap(bitmap);

        }

        result.setTag(member);

        return result;

    }