Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f87a449 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent NPE in MessagingImageMessage" into udc-dev am: 5a582c83 am: 63a955cb 

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



Change-Id: I2f349fe1bde20b71991bc625c06a86eadb2cea56
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f72c912a 63a955cb

core/java/com/android/internal/widget/MessagingImageMessage.java

+5 −0
Original line number Diff line number Diff line
@@ -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) {