Merge "Fix NPE" into ub-launcher3-master

2017-03-28 18:15:16 +00:00
parent 9e7f23cf50 dcd8b5c272
commit e463ddddc1
1 changed files with 3 additions and 1 deletions
@@ -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();