commit a7eb2ab5ebb8d1b37fdca786493159feccaa0e39
author Wenyi Wang <wenyiw@google.com> Sat Oct 24 01:43:22 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sat Oct 24 01:43:22 2015 +0000
tree 68616384fc6fcfba3f78ae9d72f42d17c4aa6fe5
parent 880053d421352985a13af7b4ae2eb81dc156fb17
parent 7de2068c2dd8ab20f8ae5f30bb238ee3d06984e3

Merge "Avoid crash in loading images" into ub-contactsdialer-a-dev
am: 7de2068c2d

* commit '7de2068c2dd8ab20f8ae5f30bb238ee3d06984e3':
  Avoid crash in loading images

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 cd70e07..cb3252f 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -513,7 +513,7 @@
         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 @@
                 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);
         }