Fixing icon cache thrashing due to an unsupported icon

Bug: 284032965
Test: Verified by reproducing the use case
Flag: N/A
Change-Id: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33
This commit is contained in:
Sunny Goyal
2023-05-31 10:18:52 -07:00
parent c0f24b4e7e
commit 41737b3e8b

View File

@@ -100,6 +100,7 @@ public class IconCache extends BaseIconCache {
private final UserCache mUserManager;
private final InstantAppResolver mInstantAppResolver;
private final IconProvider mIconProvider;
private final HandlerRunnable mCancelledRunnable;
private final SparseArray<BitmapInfo> mWidgetCategoryBitmapInfos;
@@ -117,6 +118,10 @@ public class IconCache extends BaseIconCache {
mInstantAppResolver = InstantAppResolver.newInstance(mContext);
mIconProvider = iconProvider;
mWidgetCategoryBitmapInfos = new SparseArray<>();
mCancelledRunnable = new HandlerRunnable(
mWorkerHandler, () -> null, MAIN_EXECUTOR, c -> { });
mCancelledRunnable.cancel();
}
@Override
@@ -172,23 +177,30 @@ public class IconCache extends BaseIconCache {
public HandlerRunnable updateIconInBackground(final ItemInfoUpdateReceiver caller,
final ItemInfoWithIcon info) {
Preconditions.assertUIThread();
Supplier<ItemInfoWithIcon> task;
if (info instanceof AppInfo || info instanceof WorkspaceItemInfo) {
task = () -> {
getTitleAndIcon(info, false);
return info;
};
} else if (info instanceof PackageItemInfo pii) {
task = () -> {
getTitleAndIconForApp(pii, false);
return pii;
};
} else {
Log.i(TAG, "Icon update not supported for "
+ info == null ? "null" : info.getClass().getName());
return mCancelledRunnable;
}
if (mPendingIconRequestCount <= 0) {
MODEL_EXECUTOR.setThreadPriority(Process.THREAD_PRIORITY_FOREGROUND);
}
mPendingIconRequestCount++;
HandlerRunnable<ItemInfoWithIcon> request = new HandlerRunnable<>(mWorkerHandler,
() -> {
if (info instanceof AppInfo || info instanceof WorkspaceItemInfo) {
getTitleAndIcon(info, false);
} else if (info instanceof PackageItemInfo) {
getTitleAndIconForApp((PackageItemInfo) info, false);
}
return info;
},
MAIN_EXECUTOR,
caller::reapplyItemInfo,
this::onIconRequestEnd);
task, MAIN_EXECUTOR, caller::reapplyItemInfo, this::onIconRequestEnd);
Utilities.postAsyncCallback(mWorkerHandler, request);
return request;
}