2 files changed, 4 insertions, 3 deletions
diff --git a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java
index 7e216aaa1..27e318786 100644
--- a/java/com/android/dialer/contactactions/ContactActionBottomSheet.java
+++ b/java/com/android/dialer/contactactions/ContactActionBottomSheet.java
@@ -91,7 +91,7 @@ public class ContactActionBottomSheet extends BottomSheetDialog implements OnCli
             contactView.findViewById(R.id.quick_contact_photo),
             !TextUtils.isEmpty(photoInfo.lookupUri()) ? Uri.parse(photoInfo.lookupUri()) : null,
             photoInfo.photoId(),
-            !TextUtils.isEmpty(photoInfo.photoUri()) ? Uri.parse(photoInfo.photoUri()) : null,
+            photoInfo.photoUri(),
             photoInfo.displayName(),
             photoInfo.contactType());
 
diff --git a/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java b/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java
index 2535f853d..f19fd282c 100644
--- a/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java
+++ b/java/com/android/dialer/contactactions/ContactPrimaryActionInfo.java
@@ -16,6 +16,7 @@
 package com.android.dialer.contactactions;
 
 import android.content.Intent;
+import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import com.android.dialer.DialerPhoneNumber;
@@ -40,7 +41,7 @@ public abstract class ContactPrimaryActionInfo {
     public abstract long photoId();
 
     @Nullable
-    public abstract String photoUri();
+    public abstract Uri photoUri();
 
     @Nullable
     public abstract String lookupUri();
@@ -60,7 +61,7 @@ public abstract class ContactPrimaryActionInfo {
     public abstract static class Builder {
       public abstract Builder setPhotoId(long photoId);
 
-      public abstract Builder setPhotoUri(@Nullable String photoUri);
+      public abstract Builder setPhotoUri(@Nullable Uri photoUri);
 
       public abstract Builder setLookupUri(@Nullable String lookupUri);