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

Commit 87e1f264 authored by Walter Jang's avatar Walter Jang Committed by android-build-merger
Browse files

Merge "Ensure there is always a photo and name values deltas" into ub-contactsdialer-a-dev 

am: 8a48eb5e

* commit '8a48eb5e':
  Ensure there is always a photo and name values deltas
parents b9650278 8a48eb5e

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

+6 −4
Original line number Diff line number Diff line
@@ -105,13 +105,15 @@ public class KindSectionDataList extends ArrayList<KindSectionData> { 
        // Just return the first writable entry.

        for (KindSectionData kindSectionData : this) {

            if (kindSectionData.getAccountType().areContactsWritable()) {

                RawContactModifier.ensureKindExists(kindSectionData.getRawContactDelta(),

                        kindSectionData.getAccountType(),

                        ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE);

                vlog(mimeType + ": falling back to first kind section data to write");

                RawContactModifier.ensureKindExists(kindSectionData.getRawContactDelta(),

                        kindSectionData.getAccountType(), mimeType);

                if (kindSectionData.getValuesDeltas() != null &&

                        !kindSectionData.getValuesDeltas().isEmpty()) {

                    return new Pair<>(kindSectionData, kindSectionData.getValuesDeltas().get(0));

                }

            }

        }



        wlog(mimeType+ ": no writable kind section data found");

        return null;