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

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

Merge "MessagingImageMessage: Don't crash if measured after recycle" into... 

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

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



Change-Id: Id0aca8a9a16495cf1a818e8cb3cf7d0e699054f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 198d1803 ed0d7014

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

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