commit 06a2bacf93f4f4bdc963913216d0acb783cf07f6
author blong <blong@codeaurora.org> Thu Mar 01 00:52:48 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 01 00:52:48 2018 +0000
tree 1cc5e5c8279521856be5ca64ca1bfac5884f2ed7
parent b028e23ef94104c71cd40e02c53144888a20b20b
parent a1287f7872644b161311222ab03a0c26562db2ea

Merge "Fix NullPointerException when set profile photo"
am: a1287f7872

Change-Id: I227f62fb6c2ac25d53cb225e68db0665f3e90786

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

diff --git a/src/com/android/contacts/editor/ContactEditorFragment.java b/src/com/android/contacts/editor/ContactEditorFragment.java
old mode 100644
new mode 100755
index a250b4e..2abd509
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -950,8 +950,10 @@
         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)) {