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

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

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

Change-Id: I9c42a1bb716ada0d464ab5056d53199a5ae1bb74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-04-05 09:35:36 +00:00
committed by Automerger Merge Worker
parent 474e59020e 5a582c83cc
commit 63a955cb50
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,6 +198,11 @@ public class MessagingImageMessage extends ImageView implements MessagingMessage
@Override @Override
public int getMeasuredType() { public int getMeasuredType() {
if (mDrawable == null) {
Log.e(TAG, "getMeasuredType() after recycle()!");
return MEASURED_NORMAL;
}
int measuredHeight = getMeasuredHeight(); int measuredHeight = getMeasuredHeight();
int minImageHeight; int minImageHeight;
if (mIsIsolated) { if (mIsIsolated) {