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

Commit cdb70be2 authored by Gary Mai's avatar Gary Mai Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-d9574ec3-14e0-491c-896c-32c57a3dcdf2' 

* changes:
  Special case Tachyon mimetype am: acda280a
  Special case Tachyon mimetype
parents a4b676b7 ae71b6c0

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

+10 −8
Original line number Diff line number Diff line
@@ -1465,6 +1465,7 @@ public class QuickContactActivity extends ContactsActivity { 
                final String mimeType = dataItem.getMimeType();

                if (mimeType == null) continue;



                if (!MIMETYPE_TACHYON.equals(mimeType)) {

                    final AccountType accountType = rawContact.getAccountType(this);

                    final DataKind dataKind = AccountTypeManager.getInstance(this)

                            .getKindOrFallback(accountType, mimeType);
@@ -1476,6 +1477,7 @@ public class QuickContactActivity extends ContactsActivity { 
                            dataKind));



                    if (isMimeExcluded(mimeType) || !hasData) continue;

                }



                List<DataItem> dataItemListByType = dataItemsMap.get(mimeType);

                if (dataItemListByType == null) {