Merge "Fix logic for logging bitmap errors" into sc-dev

This commit is contained in:
Jeff DeCew
2021-05-04 13:46:51 +00:00
committed by Android (Google) Code Review

View File

@@ -319,7 +319,7 @@ class ShortcutPackage extends ShortcutPackageItem {
} }
final Icon icon = si.getIcon(); final Icon icon = si.getIcon();
if (icon != null && icon.getType() != Icon.TYPE_BITMAP if (icon != null && icon.getType() != Icon.TYPE_BITMAP
&& icon.getType() == Icon.TYPE_ADAPTIVE_BITMAP) { && icon.getType() != Icon.TYPE_ADAPTIVE_BITMAP) {
continue; continue;
} }
if (icon == null && !si.hasIconFile()) { if (icon == null && !si.hasIconFile()) {