Merge "MessagingImageMessage: Don't crash if measured after recycle" into tm-dev

2022-05-25 00:08:29 +00:00
parent b92b97dd6d 2e12d55283
commit ec3ee0a5c3
1 changed files with 7 additions and 0 deletions
--- 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),