Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14412917

Change-Id: I17c6dbd5f9dd6c59142857c105300338bea3105c
This commit is contained in:
Jeff DeCew
2021-05-04 13:53:05 +00:00
committed by Automerger Merge Worker
parent 44f22bd54d b8eac19403
commit a03169570d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/pm/ShortcutPackage.java
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()) {