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

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

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

am: a33aca87

Change-Id: I3ed31b60aea692eb143be70ec6e76b5c43b22827
parents 4c598667 a33aca87

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

+1 −0
Original line number Diff line number Diff line
@@ -1563,6 +1563,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;