From dcd8b5c27292b6549fb02f85e954c1b2f010b35d Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Tue, 28 Mar 2017 11:13:15 -0700 Subject: [PATCH] Fix NPE Change-Id: If816a3cafa42f92ec32cd77ba3a3a902201d9ca4 --- src/com/android/launcher3/graphics/IconNormalizer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/graphics/IconNormalizer.java b/src/com/android/launcher3/graphics/IconNormalizer.java index 069895a38a..ce2bca649b 100644 --- a/src/com/android/launcher3/graphics/IconNormalizer.java +++ b/src/com/android/launcher3/graphics/IconNormalizer.java @@ -220,7 +220,9 @@ public class IconNormalizer { @Nullable Path path, @Nullable boolean[] outMaskShape) { if (Utilities.isAtLeastO() && d instanceof AdaptiveIconDrawable && mAdaptiveIconScale != SCALE_NOT_INITIALIZED) { - outBounds.set(mBounds); + if (outBounds != null) { + outBounds.set(mBounds); + } return mAdaptiveIconScale; } int width = d.getIntrinsicWidth();