commit a90442f350e74bba98ee9db96cdd016a2972d2b2
author qqzhou <qqzhou@codeaurora.org> Thu Aug 17 15:37:12 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 15:37:12 2017 +0000
tree ab12f028ddec1461bd649e72f533f3d984571723
parent 4c598667bce3511ef962004cbe31b576cc976de0
parent a33aca875ae2135e720385d07d637cf8819c7f8a

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

Change-Id: I3ed31b60aea692eb143be70ec6e76b5c43b22827

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;