commit 8407c932fa9767a6657bea7d2ee9a7fd2906b412
author blong <blong@codeaurora.org> Thu May 18 09:47:34 2017 +0800
committer blong <blong@codeaurora.org> Mon Sep 11 10:12:58 2017 +0800
tree c8b3c4d162b7d10fc3620592ccf1691258600186
parent a33aca875ae2135e720385d07d637cf8819c7f8a

Fix NullPointerException when set profile photo

- Add null judge when get rawcontactdelta.

Bug : 62688231

Change-Id: I31e5716fd48e7e559adb74b961f147804af6f7e0

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 da68ec6..5463322
--- a/src/com/android/contacts/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorFragment.java
@@ -945,8 +945,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)) {