Cleanup ENABLE_BULK_WORKSPACE_ICON_LOADING

Flag: ENABLE_BULK_WORKSPACE_ICON_LOADING
Fixes: 270392203
Test: restarted device
Change-Id: Iac6c3da1fb7cfc5c9f7e947b3caf679a50133343
This commit is contained in:
Schneider Victor-tulias
2023-04-05 15:26:44 -07:00
parent acb218294b
commit 4217c930cc
2 changed files with 13 additions and 19 deletions

View File

@@ -417,7 +417,7 @@ public class LoaderTask implements Runnable {
tempPackageKey, widgetHelper, pmHelper, shortcutKeyToPinnedShortcuts,
iconRequestInfos, unlockedUsers, isSafeMode, allDeepShortcuts);
}
maybeLoadWorkspaceIconsInBulk(iconRequestInfos);
tryLoadWorkspaceIconsInBulk(iconRequestInfos);
} finally {
IOUtils.closeSilently(c);
}
@@ -598,8 +598,8 @@ public class LoaderTask implements Runnable {
// Already verified above that user is same as default user
info = c.getRestoredItemInfo(intent);
} else if (c.itemType == Favorites.ITEM_TYPE_APPLICATION) {
info = c.getAppShortcutInfo(intent, allowMissingTarget, useLowResIcon,
!FeatureFlags.ENABLE_BULK_WORKSPACE_ICON_LOADING.get());
info = c.getAppShortcutInfo(
intent, allowMissingTarget, useLowResIcon, false);
} else if (c.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) {
ShortcutKey key = ShortcutKey.fromIntent(intent, c.user);
if (unlockedUsers.get(c.serialNumber)) {
@@ -861,21 +861,19 @@ public class LoaderTask implements Runnable {
}
}
private void maybeLoadWorkspaceIconsInBulk(
private void tryLoadWorkspaceIconsInBulk(
List<IconRequestInfo<WorkspaceItemInfo>> iconRequestInfos) {
if (FeatureFlags.ENABLE_BULK_WORKSPACE_ICON_LOADING.get()) {
Trace.beginSection("LoadWorkspaceIconsInBulk");
try {
mIconCache.getTitlesAndIconsInBulk(iconRequestInfos);
for (IconRequestInfo<WorkspaceItemInfo> iconRequestInfo : iconRequestInfos) {
WorkspaceItemInfo wai = iconRequestInfo.itemInfo;
if (mIconCache.isDefaultIcon(wai.bitmap, wai.user)) {
iconRequestInfo.loadWorkspaceIcon(mApp.getContext());
}
Trace.beginSection("LoadWorkspaceIconsInBulk");
try {
mIconCache.getTitlesAndIconsInBulk(iconRequestInfos);
for (IconRequestInfo<WorkspaceItemInfo> iconRequestInfo : iconRequestInfos) {
WorkspaceItemInfo wai = iconRequestInfo.itemInfo;
if (mIconCache.isDefaultIcon(wai.bitmap, wai.user)) {
iconRequestInfo.loadWorkspaceIcon(mApp.getContext());
}
} finally {
Trace.endSection();
}
} finally {
Trace.endSection();
}
}