Merge "Use .setImageURI when updating the photo Uri" into qt-dev am: cd8de46190
am: 139d8effb5

Change-Id: I2625ff082d9585a8f31d83d3161b73dd78b45382
diff --git a/src/com/android/contacts/editor/PhotoEditorView.java b/src/com/android/contacts/editor/PhotoEditorView.java
index 09ba797..09a15b0 100644
--- a/src/com/android/contacts/editor/PhotoEditorView.java
+++ b/src/com/android/contacts/editor/PhotoEditorView.java
@@ -198,8 +198,7 @@
      * Binds a full size photo loaded from the given Uri.
      */
     public void setFullSizedPhoto(Uri photoUri) {
-        EditorUiUtils.loadPhoto(ContactPhotoManager.getInstance(getContext()),
-                mPhotoImageView, photoUri);
+        mPhotoImageView.setImageURI(photoUri);
         mIsNonDefaultPhotoBound = true;
         updatePhotoDescription();
     }