From 24dfdc8683ae5307f28c7f6cb49f577ceb6b0e9a Mon Sep 17 00:00:00 2001
From: Valentin Iftime <valiiftime@google.com>
Date: Fri, 31 Mar 2023 16:46:36 +0200
Subject: [PATCH] Prevent NPE in MessagingImageMessage

 Add check for null drawable in case it was recycled
 before getMeasuredType.

Test: manual
Bug: 238485748
Change-Id: I3e465f9b8287f727c56fd45cd339dada005364f2
---
 .../com/android/internal/widget/MessagingImageMessage.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/com/android/internal/widget/MessagingImageMessage.java b/core/java/com/android/internal/widget/MessagingImageMessage.java
index 8e7fe18b222b5..098bce14e6192 100644
--- a/core/java/com/android/internal/widget/MessagingImageMessage.java
+++ b/core/java/com/android/internal/widget/MessagingImageMessage.java
@@ -198,6 +198,11 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage
 
     @Override
     public int getMeasuredType() {
+        if (mDrawable == null) {
+            Log.e(TAG, "getMeasuredType() after recycle()!");
+            return MEASURED_NORMAL;
+        }
+
         int measuredHeight = getMeasuredHeight();
         int minImageHeight;
         if (mIsIsolated) {