summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2018-02-06 23:29:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-02-06 23:29:10 +0000
commit077e3042b8209dbe72b528ac261a135229332129 (patch)
treecdb999ad54c9372356f606a918d197046e4a8899 /core/java
parenta54e69a116d8a8581e178bae8c4f9ccecff46874 (diff)
parent0b45fa9e656f95e0bc94e882a93b7c72a2c1bad8 (diff)
Merge "Fixed an issue where we would access the wrong drawable"
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/widget/MessagingImageMessage.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/widget/MessagingImageMessage.java b/core/java/com/android/internal/widget/MessagingImageMessage.java
index d5ebf9cbf2cd..961f90a3c110 100644
--- a/core/java/com/android/internal/widget/MessagingImageMessage.java
+++ b/core/java/com/android/internal/widget/MessagingImageMessage.java
@@ -101,7 +101,7 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage
e.printStackTrace();
return false;
}
- int intrinsicHeight = mDrawable.getIntrinsicHeight();
+ int intrinsicHeight = drawable.getIntrinsicHeight();
if (intrinsicHeight == 0) {
Log.w(TAG, "Drawable with 0 intrinsic height was returned");
return false;