diff options
| author | 2022-05-25 00:33:41 +0000 | |
|---|---|---|
| committer | 2022-05-25 00:33:41 +0000 | |
| commit | 37b8f184f993e9f9cad5038e91b2a1da5fcf1b7c (patch) | |
| tree | 0e3f6a3ed1ced5d158f152f62f24f025d165ae5b | |
| parent | adfba5d6e1298bb1d9e9455af0f65d26371bad67 (diff) | |
| parent | 646ae2222998caaf888f4e40991ed725ce07dcb8 (diff) | |
Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev am: ec3ee0a5c3 am: 646ae22229
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18577093
Change-Id: I9ae2f43520ae5c401c7df09a95dd5188b33f2280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/com/android/internal/widget/MessagingImageMessage.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/core/java/com/android/internal/widget/MessagingImageMessage.java b/core/java/com/android/internal/widget/MessagingImageMessage.java index f7955c3f72da..8e7fe18b222b 100644 --- a/core/java/com/android/internal/widget/MessagingImageMessage.java +++ b/core/java/com/android/internal/widget/MessagingImageMessage.java @@ -226,6 +226,13 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { super.onMeasure(widthMeasureSpec, heightMeasureSpec); + + if (mDrawable == null) { + Log.e(TAG, "onMeasure() after recycle()!"); + setMeasuredDimension(0, 0); + return; + } + if (mIsIsolated) { // When isolated we have a fixed size, let's use that sizing. setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), |