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

Commit 4803bc1a authored by Alan Viverette's avatar Alan Viverette
Browse files

Fix ordering of dimension caching during ImageView.setResource() 

BUG: 12876148
Change-Id: I8c27546851f491e229a880307d34e1da8e74e6c2
parent 4c2315d1

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) {