commit 65175dcd2e8caa5ef156c77646651d034142a9a4
author Tingting Wang <tingtingw@google.com> Wed Oct 21 18:33:51 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 21 18:33:51 2015 +0000
tree baf11803c7a2781f0c444ab3b52d46e1dcd76c98
parent bfea74f34f3c1c4ea33302c0c59635acb7b801ad
parent ac4b12f5e303647f7a6437e36be7026446d4e99f

Merge "Fix NullPointerException in Contact Editor." into ub-contactsdialer-a-dev

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

diff --git a/src/com/android/contacts/editor/CompactRawContactsEditorView.java b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
index b935f46..1b2f60b 100644
--- a/src/com/android/contacts/editor/CompactRawContactsEditorView.java
+++ b/src/com/android/contacts/editor/CompactRawContactsEditorView.java
@@ -1024,7 +1024,7 @@
         if (TextUtils.isEmpty(mReadOnlyDisplayName)) return;
         final List<CompactKindSectionView> kindSectionViews
                 = mKindSectionViewsMap.get(StructuredName.CONTENT_ITEM_TYPE);
-        if (kindSectionViews.isEmpty()) return;
+        if (kindSectionViews == null || kindSectionViews.isEmpty()) return;
         final CompactKindSectionView primaryNameKindSectionView = kindSectionViews.get(0);
         if (primaryNameKindSectionView.isEmptyName()) {
             vlog("name: using read only display name as primary name");