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

Commit 36923016 authored by Maurice Chu's avatar Maurice Chu Committed by Android (Google) Code Review
Browse files

Merge "Fix regression when editing contacts" into jb-dev

parents 4fc5cfb4 a2f9090c

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

+1 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ public class ContactEditorFragment extends Fragment implements 
            final ValuesDelta values = entity.getValues();

            if (values.isVisible()) {

                final ValuesDelta primary = entity.getPrimaryEntry(Photo.CONTENT_ITEM_TYPE);

                if (primary.getAsByteArray(Photo.PHOTO) != null) {

                if (primary != null && primary.getAsByteArray(Photo.PHOTO) != null) {

                    countWithPicture++;

                } else {

                    final long rawContactId = values.getAsLong(RawContacts._ID);