diff options
| author | blong <blong@codeaurora.org> | 2018-03-01 01:01:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 01:01:56 +0000 |
| commit | 56386270013ab1d2e6f3a9233a8d61ea2f180ec8 (patch) | |
| tree | 8f6548c9f2bd944215a7d1e2bda1cc65838e1012 /src/com/android/contacts | |
| parent | 256d9fe8f7669a31a9b64d99312009001e0421ee (diff) | |
| parent | 3b453896be2ce0343f174496bcce39559733e6c3 (diff) | |
| download | packages_apps_Contacts-56386270013ab1d2e6f3a9233a8d61ea2f180ec8.tar.gz packages_apps_Contacts-56386270013ab1d2e6f3a9233a8d61ea2f180ec8.tar.bz2 packages_apps_Contacts-56386270013ab1d2e6f3a9233a8d61ea2f180ec8.zip | |
Merge "Fix NullPointerException when set profile photo" am: a1287f7872 am: 06a2bacf93
am: 3b453896be
Change-Id: Icb0a0a7dad359e8fb3921adc9cf76eb92af2ac45
Diffstat (limited to 'src/com/android/contacts')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/editor/ContactEditorFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java index a250b4ef4..2abd50977 100644..100755 --- a/src/com/android/contacts/editor/ContactEditorFragment.java +++ b/src/com/android/contacts/editor/ContactEditorFragment.java @@ -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)) { |