commit 3bb6fef0597693193356189a56cdee9642ce33fb
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 03 16:57:08 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Jun 03 16:57:08 2023 +0000
tree 8b73003c1cec65d9c37510292d3dd10881b83d40
parent 6594fba1221a6f5712adf2d5c6d46d8ca85cee47
parent ae60510918bff13bc63a7508f096192ae51b39f3

[coastguard skipped] Merge sparse cherrypicks from sparse-10252186-L42700000961059379 into tm-qpr3-release.

COASTGUARD_SKIP: Ibcd59f63194e106161ddecfe0e39db5af5223089
COASTGUARD_SKIP: I2ee30dfa5e4170272b5353f270a69b38750a0bd5

Change-Id: I040c41f6dfa863b80acab2683ce44f894eb4b9c4

src/com/android/launcher3/icons/IconCache.java

diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index bc57f66..3c63f26 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -100,7 +100,6 @@
     private final UserCache mUserManager;
     private final InstantAppResolver mInstantAppResolver;
     private final IconProvider mIconProvider;
-    private final HandlerRunnable mCancelledRunnable;
 
     private final SparseArray<BitmapInfo> mWidgetCategoryBitmapInfos;
 
@@ -122,10 +121,6 @@
         mInstantAppResolver = InstantAppResolver.newInstance(mContext);
         mIconProvider = iconProvider;
         mWidgetCategoryBitmapInfos = new SparseArray<>();
-
-        mCancelledRunnable = new HandlerRunnable(
-                mWorkerHandler, () -> null, MAIN_EXECUTOR, c -> { });
-        mCancelledRunnable.cancel();
     }
 
     @Override
@@ -181,30 +176,23 @@
     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) {
-            task = () -> {
-                getTitleAndIconForApp((PackageItemInfo) info, false);
-                return info;
-            };
-        } 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,
-                task, MAIN_EXECUTOR, caller::reapplyItemInfo, this::onIconRequestEnd);
+                () -> {
+                    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);
         Utilities.postAsyncCallback(mWorkerHandler, request);
         return request;
     }