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

Commit 075f9f5b authored by Chris Wren's avatar Chris Wren
Browse files

work around bug in LauncherAppsCompat to find restored icons

Bug: 14895464
Change-Id: Iff4f1a9a2e8edf789231be7a1c20e277e18eb05c
parent 418dcb88
Loading
Loading
Loading
Loading
+11 −2
Original line number Diff line number Diff line
@@ -249,11 +249,20 @@ public class IconCache {

    public Bitmap getIcon(Intent intent, String title, UserHandleCompat user) {
        synchronized (mCache) {
            final LauncherActivityInfoCompat launcherActInfo =
            LauncherActivityInfoCompat launcherActInfo =
                    mLauncherApps.resolveActivity(intent, user);
            ComponentName component = intent.getComponent();

            if (launcherActInfo == null || component == null) {
            try {
                launcherActInfo.getComponentName();
            } catch (NullPointerException e) {
                // launcherActInfo is invalid: b/14891460
                launcherActInfo = null;
            }

            // null info means not installed, but if we have a component from the intent then
            // we should still look in the cache for restored app icons.
            if (launcherActInfo == null && component == null) {
                return getDefaultIcon(user);
            }