commit e463ddddc1924ac3611871fd112b187c612a1edf
author Hyunyoung Song <hyunyoungs@google.com> Tue Mar 28 18:15:16 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 18:15:17 2017 +0000
tree 60d15b95b1f66801da18ec18ca7b239960cc16bf
parent 9e7f23cf50f48f78e29f94a6018f328995ca9b70
parent dcd8b5c27292b6549fb02f85e954c1b2f010b35d

Merge "Fix NPE" into ub-launcher3-master

src/com/android/launcher3/graphics/IconNormalizer.java

diff --git a/src/com/android/launcher3/graphics/IconNormalizer.java b/src/com/android/launcher3/graphics/IconNormalizer.java
index 069895a..ce2bca6 100644
--- a/src/com/android/launcher3/graphics/IconNormalizer.java
+++ b/src/com/android/launcher3/graphics/IconNormalizer.java
@@ -220,7 +220,9 @@
             @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();