From 4803bc1ab732323f907260e3eb89e4498bc75739 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 3 Feb 2014 14:32:07 -0800
Subject: Fix ordering of dimension caching during ImageView.setResource()

BUG: 12876148
Change-Id: I8c27546851f491e229a880307d34e1da8e74e6c2
---
 core/java/android/widget/ImageView.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'core/java/android/widget/ImageView.java')

diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java
index 62f9b0b..58e4e86 100644
--- a/core/java/android/widget/ImageView.java
+++ b/core/java/android/widget/ImageView.java
@@ -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) {
-- 
cgit v1.1