Merge "Fix NPE" into ub-launcher3-master

This commit is contained in:
Hyunyoung Song authored and Android (Google) Code Review committed 2017-03-28 18:15:17 +00:00
commit e463ddddc1
1 file changed
+3 -1
@@ -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();