Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53985a4e authored by qqzhou's avatar qqzhou Committed by android-build-merger
Browse files

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

Merge "Contacts: Fix NPE in QuickContactActivity in monkey test" am: 6529af3c am: a33aca87 am: a90442f3
am: d59df30b

Change-Id: Iaf28d13be1e4f424f387fa0f563fc286c8323614
parents feddd0d8 d59df30b

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

+1 −0
Original line number Diff line number Diff line
@@ -1606,6 +1606,7 @@ public class QuickContactActivity extends ContactsActivity { 
    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;