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

Commit 7de2068c authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Avoid crash in loading images" into ub-contactsdialer-a-dev

parents d1ef00f2 5cf746f6

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

+2 −2
Original line number Diff line number Diff line
@@ -513,7 +513,7 @@ public class QuickContactActivity extends ContactsActivity 
        final byte[] photoBytes = mContactData.getThumbnailPhotoBinaryData();

        if (photoBytes != null) {

            ContactPhotoManager.getInstance(this).loadThumbnail(mSuggestionSummaryPhoto, photoId,

                /* darkTheme */ false , /* isCircular */ true , request, null);

                /* darkTheme */ false , /* isCircular */ true , request);

        } else {

            ContactPhotoManager.DEFAULT_AVATAR.applyDefaultImage(mSuggestionSummaryPhoto,

                    -1, false, request);
@@ -579,7 +579,7 @@ public class QuickContactActivity extends ContactsActivity 
                R.id.aggregation_suggestion_photo);

        if (suggestion.photo != null) {

            ContactPhotoManager.getInstance(this).loadThumbnail(photo, suggestion.photoId,

                   /* darkTheme */ false, /* isCircular */ true, null, null);

                   /* darkTheme */ false, /* isCircular */ true, request);

        } else {

            ContactPhotoManager.DEFAULT_AVATAR.applyDefaultImage(photo, -1, false, request);

        }