commit d59df30b8b9d21f3e3019dbaf863df53361bc825
author qqzhou <qqzhou@codeaurora.org> Thu Aug 17 15:43:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Aug 17 15:43:17 2017 +0000
tree 393a5f0b43ce4b9307905607e1414081d6bfd018
parent 9a89ed0509f9e36cbbfed90470fdbfa4f615bd7e
parent a90442f350e74bba98ee9db96cdd016a2972d2b2

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

Change-Id: Ie3b8420c3d8818cad927010eb0c5244b64631fb9

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 3c088b4..535fe69 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -1602,6 +1602,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;