commit 17c97afe1b18d9edf7757a38bb8d8bd6a819072b
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 01 08:21:32 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 01 08:21:32 2018 +0000
tree 8f6548c9f2bd944215a7d1e2bda1cc65838e1012
parent e6a484b1b6c7d44dedf49b6c9dc42bfd6394287f
parent 56386270013ab1d2e6f3a9233a8d61ea2f180ec8

Snap for 4628106 from 56386270013ab1d2e6f3a9233a8d61ea2f180ec8 to pi-release

Change-Id: I718c8e25261a3d6fb07f0d7dceb3a589ab696597

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