commit a33aca875ae2135e720385d07d637cf8819c7f8a
author qqzhou <qqzhou@codeaurora.org> Thu Aug 17 15:33:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 15:33:43 2017 +0000
tree 5cfc5e09e8ffbee5aec9f47837c11422558e896a
parent 37e91122cb647057ebe8e06269f097855e48dc08
parent 6529af3c9c26cf12e5bb2e574762b914b693ec55

Merge "Contacts: Fix NPE in QuickContactActivity in monkey test"
am: 6529af3c9c

Change-Id: Ie128ecba2395fb881b1fa437581dfe104311e0a8

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 014e1d5..bd419b5 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1563,6 +1563,7 @@
     private static Entry dataItemToEntry(DataItem dataItem, DataItem secondDataItem,
             Context context, Contact contactData,
             final MutableString aboutCardName) {
+        if (contactData == null) return null;
         Drawable icon = null;
         String header = null;
         String subHeader = null;