From 23085999e062d3cd57ec522e6b206d3af9589623 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Wed, 31 May 2023 10:18:52 -0700
Subject: [PATCH 1/2] Fixing icon cache thrashing due to an unsupported icon

Bug: 284032965
Test: Verified by reproducing the use case
Flag: N/A
Change-Id: I835dd545a01eb2fd7990e0fd5ad51bac0e4b1f33
(cherry picked from commit 41737b3e8bbe4c72ed8570771b7d64fdbcfcebbb)
---
 .../android/launcher3/icons/IconCache.java    | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 3c63f26ec4..72feb7b572 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -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;
 
@@ -121,6 +122,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
@@ -176,23 +181,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;
     }

From 250661e172780570a66768d443071b32059cc57d Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Sat, 3 Jun 2023 08:08:37 -0700
Subject: [PATCH 2/2] Fixing syntax error due to java-version changes

Bug: 284032965
Test: Presubmit
Change-Id: I2ee30dfa5e4170272b5353f270a69b38750a0bd5
---
 src/com/android/launcher3/icons/IconCache.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index 72feb7b572..bc57f66b87 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -187,10 +187,10 @@ public class IconCache extends BaseIconCache {
                 getTitleAndIcon(info, false);
                 return info;
             };
-        } else if (info instanceof PackageItemInfo pii) {
+        } else if (info instanceof PackageItemInfo) {
             task = () -> {
-                getTitleAndIconForApp(pii, false);
-                return pii;
+                getTitleAndIconForApp((PackageItemInfo) info, false);
+                return info;
             };
         } else {
             Log.i(TAG, "Icon update not supported for "