aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 09:26:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Bugfix: Add null safety when accessing icon database for main activities for LoaderTask loadAllApps." into 24D1-dev

Browse Source
This commit is contained in:
Rohit Goyal
2024-03-14 15:22:04 +00:00
committed by Android (Google) Code Review
parent 8a85cb5c9b b313ac7a30
commit aca99b60ab
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/launcher3/icons/IconCache.java
View File

@@ -469,17 +469,22 @@ public class IconCache extends BaseIconCache {
duplicateIconRequestsMap.get(cn);
if (cn != null) {
CacheEntry entry = cacheLocked(
cn,
/* user = */ sectionKey.first,
() -> duplicateIconRequests.get(0).launcherActivityInfo,
mLauncherActivityInfoCachingLogic,
c,
/* usePackageIcon= */ false,
/* useLowResIcons = */ sectionKey.second);
if (duplicateIconRequests != null) {
CacheEntry entry = cacheLocked(
cn,
/* user = */ sectionKey.first,
() -> duplicateIconRequests.get(0).launcherActivityInfo,
mLauncherActivityInfoCachingLogic,
c,
/* usePackageIcon= */ false,
/* useLowResIcons = */ sectionKey.second);
for (IconRequestInfo<T> iconRequest : duplicateIconRequests) {
applyCacheEntry(entry, iconRequest.itemInfo);
for (IconRequestInfo<T> iconRequest : duplicateIconRequests) {
applyCacheEntry(entry, iconRequest.itemInfo);
}
} else {
Log.e(TAG, "Found entry in icon database but no main activity "
+ "entry for cn: " + cn);
}
}
}