Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a0316957 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I17c6dbd5f9dd6c59142857c105300338bea3105c
parents 44f22bd5 b8eac194

services/core/java/com/android/server/pm/ShortcutPackage.java

+1 −1
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ class ShortcutPackage extends ShortcutPackageItem { 
            }

            final Icon icon = si.getIcon();

            if (icon != null && icon.getType() != Icon.TYPE_BITMAP

                    && icon.getType() == Icon.TYPE_ADAPTIVE_BITMAP) {

                    && icon.getType() != Icon.TYPE_ADAPTIVE_BITMAP) {

                continue;

            }

            if (icon == null && !si.hasIconFile()) {