From 8f09aa3438a5b5b8e1d14f88025215af748b4a91 Mon Sep 17 00:00:00 2001 From: Jon Miranda Date: Fri, 22 Jan 2021 17:49:13 -0500 Subject: [PATCH] Fix IllegalArgumentException for Float.NaN in ClipIconView. Bug: 173703326 Test: not able to repo bug but this prevents the code from executing in bad case Change-Id: I3701c040e72e6ce37a624b10bb82b2200935e283 --- src/com/android/launcher3/views/ClipIconView.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/com/android/launcher3/views/ClipIconView.java b/src/com/android/launcher3/views/ClipIconView.java index fab0bd4a0a..4e82336b09 100644 --- a/src/com/android/launcher3/views/ClipIconView.java +++ b/src/com/android/launcher3/views/ClipIconView.java @@ -161,6 +161,11 @@ public class ClipIconView extends View implements ClipPathView { float scaleY = rect.height() / minSize; float scale = Math.max(1f, Math.min(scaleX, scaleY)); + if (Float.isNaN(scale)) { + // Views are no longer laid out, do not update. + return; + } + update(rect, progress, shapeProgressStart, cornerRadius, isOpening, scale, minSize, lp, isVerticalBarLayout, dp);