Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit deb83f99 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android Git Automerger
Browse files

am 159f0015: Merge change I98819b18 into eclair-mr2 

Merge commit '159f0015' into eclair-mr2-plus-aosp

* commit '159f0015':
  Allow resource and file URIs in ImageView.setImageURI()
parents c0c7b32e 159f0015

core/java/android/widget/ImageView.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package android.widget;

package android.widget;





import android.content.ContentResolver;

import android.content.Context;

import android.content.Context;

import android.content.res.Resources;

import android.content.res.Resources;

import android.content.res.TypedArray;

import android.content.res.TypedArray;
@@ -489,7 +490,10 @@ public class ImageView extends View { 
                mUri = null;

                mUri = null;

            }

            }

        } else if (mUri != null) {

        } else if (mUri != null) {

            if ("content".equals(mUri.getScheme())) {

            String scheme = mUri.getScheme();

            if (ContentResolver.SCHEME_CONTENT.equals(scheme)

                    || ContentResolver.SCHEME_ANDROID_RESOURCE.equals(scheme)

                    || ContentResolver.SCHEME_FILE.equals(scheme)) {

                try {

                try {

                    d = Drawable.createFromStream(

                    d = Drawable.createFromStream(

                        mContext.getContentResolver().openInputStream(mUri),

                        mContext.getContentResolver().openInputStream(mUri),