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

Commit 41e240cb authored by Schneider Victor-tulias's avatar Schneider Victor-tulias Committed by Automerger Merge Worker
Browse files

Fix launcher crash loop. am: fabee838 am: 5894c65e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/16493487

Change-Id: I91c48b82cc008e3f5d92d86e8180e0d6f7329357
parents f1dad8f0 5894c65e
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -261,7 +261,14 @@ public abstract class BaseIconCache {
        // (e.g. fallback icon, default icon). So we drop here since there's no point in caching
        // an empty entry.
        if (entry.bitmap.isNullOrLowRes()) return;
        entry.title = cachingLogic.getLabel(object);

        CharSequence entryTitle = cachingLogic.getLabel(object);
        if (entryTitle == null) {
            Log.d(TAG, "No label returned from caching logic instance: " + cachingLogic);
            return;
        }
        entry.title = entryTitle;

        entry.contentDescription = mPackageManager.getUserBadgedLabel(entry.title, user);
        if (cachingLogic.addToMemCache()) mCache.put(key, entry);