Merge "Prevent NPE in MessagingImageMessage" into udc-dev am: 5a582c83cc am: 63a955cb50

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22380788

Change-Id: I2f349fe1bde20b71991bc625c06a86eadb2cea56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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) {