msemes/Flexera-Launcher
1
0 Fork 0
Code Issues Pull Requests Actions 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 authored and Android (Google) Code Review committed 2024-03-14 15:22:04 +00:00
2 parents 8a85cb5c9b b313ac7a30
commit aca99b60ab
1 file changed
+15 -10
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/icons/IconCache.java
+15 -10
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);
}
}
}