Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ic462a801aa9b5322285600c86bb52fcbaf0c7bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-05-25 00:14:45 +00:00
committed by Automerger Merge Worker
parent 22b5b92afc ec3ee0a5c3
commit 646ae22229
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/widget/MessagingImageMessage.java
View File

@@ -226,6 +226,13 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage
@Override @Override
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec); super.onMeasure(widthMeasureSpec, heightMeasureSpec);
if (mDrawable == null) {
Log.e(TAG, "onMeasure() after recycle()!");
setMeasuredDimension(0, 0);
return;
}
if (mIsIsolated) { if (mIsIsolated) {
// When isolated we have a fixed size, let's use that sizing. // When isolated we have a fixed size, let's use that sizing.
setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec),