summaryrefslogtreecommitdiffstats
path: root/src/com/android/contacts/common/ContactPhotoManager.java
diff options
context:
space:
mode:
authorRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-05 20:04:57 +0000
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-11-05 20:04:57 +0000
commita42f690f2014b3588d67677c5f30859790600eb7 (patch)
treef5af06adc40a5a5c40377d060a9b0533b8e6cb09 /src/com/android/contacts/common/ContactPhotoManager.java
parentd70b3939dcbaa1ca04a120b9c8aed00971824ac9 (diff)
parent1d562555a51937778a16d0f7f19a61bce48aaf1c (diff)
downloadandroid_packages_apps_ContactsCommon-a42f690f2014b3588d67677c5f30859790600eb7.tar.gz
android_packages_apps_ContactsCommon-a42f690f2014b3588d67677c5f30859790600eb7.tar.bz2
android_packages_apps_ContactsCommon-a42f690f2014b3588d67677c5f30859790600eb7.zip
Merge tag 'android-4.4_r1' into cm-11.0
Android 4.4 Release 1.0
Diffstat (limited to 'src/com/android/contacts/common/ContactPhotoManager.java')
-rw-r--r--src/com/android/contacts/common/ContactPhotoManager.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/ContactPhotoManager.java b/src/com/android/contacts/common/ContactPhotoManager.java
index ea49d56e..995201d6 100644
--- a/src/com/android/contacts/common/ContactPhotoManager.java
+++ b/src/com/android/contacts/common/ContactPhotoManager.java
@@ -58,6 +58,7 @@ import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.ref.Reference;
import java.lang.ref.SoftReference;
+import java.net.URL;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -1109,7 +1110,13 @@ class ContactPhotoManagerImpl extends ContactPhotoManager implements Callback {
}
try {
if (DEBUG) Log.d(TAG, "Loading " + uri);
- InputStream is = mResolver.openInputStream(uri);
+ final String scheme = uri.getScheme();
+ InputStream is = null;
+ if (scheme.equals("http") || scheme.equals("https")) {
+ is = new URL(uri.toString()).openStream();
+ } else {
+ is = mResolver.openInputStream(uri);
+ }
if (is != null) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {