summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2013-09-10 13:49:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-10 13:49:25 -0700
commitfc9bb205c6d0d321c0d0eead31845c1f728e1ed6 (patch)
tree6980afd1902a0174a88d0be9227db53ca6064630
parent9e2b15bbfb94c12f1c318c81c858d220f6dfb1c6 (diff)
parent03d95d304b800a292ea734e23dd42056aff291b8 (diff)
downloadandroid_packages_apps_ContactsCommon-fc9bb205c6d0d321c0d0eead31845c1f728e1ed6.tar.gz
android_packages_apps_ContactsCommon-fc9bb205c6d0d321c0d0eead31845c1f728e1ed6.tar.bz2
android_packages_apps_ContactsCommon-fc9bb205c6d0d321c0d0eead31845c1f728e1ed6.zip
am 03d95d30: am 9a0f2498: Support loading http images
* commit '03d95d304b800a292ea734e23dd42056aff291b8': Support loading http images
-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 {