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

Commit a1287f78 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NullPointerException when set profile photo"

parents 31831e42 8407c932

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

100644 → 100755
+4 −2
Original line number Diff line number Diff line
@@ -950,8 +950,10 @@ public class ContactEditorFragment extends Fragment implements 
        if (isEditingReadOnlyRawContactWithNewContact()) {

            // We created a new raw contact delta with a default display name.

            // We must test for pending changes while ignoring the default display name.

            final ValuesDelta beforeDelta = mState.getByRawContactId(mReadOnlyDisplayNameId)

                    .getSuperPrimaryEntry(StructuredName.CONTENT_ITEM_TYPE);

            final RawContactDelta beforeRawContactDelta = mState

                    .getByRawContactId(mReadOnlyDisplayNameId);

            final ValuesDelta beforeDelta = beforeRawContactDelta == null ? null :

                  beforeRawContactDelta.getSuperPrimaryEntry(StructuredName.CONTENT_ITEM_TYPE);

            final ValuesDelta pendingDelta = mState

                    .getSuperPrimaryEntry(StructuredName.CONTENT_ITEM_TYPE);

            if (structuredNamesAreEqual(beforeDelta, pendingDelta)) {