commit 6529af3c9c26cf12e5bb2e574762b914b693ec55
author Treehugger Robot <treehugger-gerrit@google.com> Thu Aug 17 15:24:52 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Aug 17 15:24:52 2017 +0000
tree a0f479bebd8d28f690330bc53feb30f8f5c2f29e
parent 41e553f6ec13e860694a2790cea82a4300b6703e
parent fa777b684d6ac557c3a039fbc228af159ed659b2

Merge "Contacts: Fix NPE in QuickContactActivity in monkey test"

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 c63c989..6c10f4d 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1717,6 +1717,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;