commit 96e7fc65257e1aab2f1fc4f7900832514f584b0f
author Gary Mai <garymai@google.com> Mon Dec 19 21:58:18 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Dec 19 21:58:18 2016 +0000
tree d029707d5ddab03fc385d1a0e9b70609af155ae7
parent d14743263df73d2c715bca44962a181f5ac1ae3b
parent 860698b8d4542a55da5ec40032a361433b525aad

Add null check before copying name fields
am: 860698b8d4

Change-Id: I4bb6db79340cb1a218739b7c3fcf5650b3beff4b

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
index bc0c7f8..be583b0 100644
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -1211,8 +1211,11 @@
                 .getSuperPrimaryEntry(StructuredName.CONTENT_ITEM_TYPE);
         final ValuesDelta readNameDelta = readOnly
                 .getSuperPrimaryEntry(StructuredName.CONTENT_ITEM_TYPE);
-        writeNameDelta.copyStructuredNameFieldsFrom(readNameDelta);
         mCopyReadOnlyName = false;
+        if (writeNameDelta == null || readNameDelta == null) {
+            return;
+        }
+        writeNameDelta.copyStructuredNameFieldsFrom(readNameDelta);
     }
 
     /**