commit a1287f7872644b161311222ab03a0c26562db2ea
author Treehugger Robot <treehugger-gerrit@google.com> Thu Mar 01 00:38:09 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 01 00:38:09 2018 +0000
tree 1cc5e5c8279521856be5ca64ca1bfac5884f2ed7
parent 31831e4249f8e2674e4dc8cc1d87798b2db8338e
parent 8407c932fa9767a6657bea7d2ee9a7fd2906b412

Merge "Fix NullPointerException when set profile photo"

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)) {