Merge "Prevent NPE in MessagingImageMessage" into udc-dev

2023-04-05 09:34:31 +00:00
parent eab2ec1072 24dfdc8683
commit 5a582c83cc
1 changed files with 5 additions and 0 deletions
--- 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) {