commit 53985a4e2cbeb0e5b17a54adb9eafef1dfe601d1
author qqzhou <qqzhou@codeaurora.org> Thu Aug 17 15:50:09 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 15:50:09 2017 +0000
tree af7710dcd37b3596d05f0e25bd26d4da109a7c1d
parent feddd0d8fafddcf57aeb8759e7b72a1e7f3b887d
parent d59df30b8b9d21f3e3019dbaf863df53361bc825

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

Change-Id: Iaf28d13be1e4f424f387fa0f563fc286c8323614

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 5da7502..494c9c1 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1606,6 +1606,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;