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

Commit e5aea3bb authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Fix ordering of dimension caching during ImageView.setResource()"

parents e0abb661 4803bc1a

core/java/android/widget/ImageView.java

+3 −3
Original line number Diff line number Diff line
@@ -364,13 +364,13 @@ public class ImageView extends View { 
    @android.view.RemotableViewMethod

    public void setImageResource(int resId) {

        if (mUri != null || mResource != resId) {

            final int oldWidth = mDrawableWidth;

            final int oldHeight = mDrawableHeight;



            updateDrawable(null);

            mResource = resId;

            mUri = null;



            final int oldWidth = mDrawableWidth;

            final int oldHeight = mDrawableHeight;



            resolveUri();



            if (oldWidth != mDrawableWidth || oldHeight != mDrawableHeight) {