commit 24e092c0f3a2069c5c8c10423f7a202e3840a350
author Charlie Anderson <charlander@google.com> Thu Sep 19 15:08:05 2024 -0400
committer Charlie Anderson <charlander@google.com> Thu Sep 19 15:13:13 2024 -0400
tree 750e21d6349370374fe9fa927ab1e4fcc6504e5d
parent 5024f96a4423e746849dc35352914cadc63b8362

Ensure icons are invalidated when useNewIconForArchivedApps flag is flipped.

This way when launcher loads and the flag value has changed, archived apps fetch new icons to avoid having the wrong icon from cache.

Bug: 364856793
Flag: com.android.launcher3.use_new_icon_for_archived_apps
Test: manually flipping flag and rebooting
Change-Id: I5c83fea4138c1afad703dd43242d4afe620448d4

iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java

diff --git a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
index b96b4f7..6b5b85d 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/cache/BaseIconCache.java
@@ -57,6 +57,7 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.annotation.WorkerThread;
 
+import com.android.launcher3.Flags;
 import com.android.launcher3.icons.BaseIconFactory;
 import com.android.launcher3.icons.BaseIconFactory.IconOptions;
 import com.android.launcher3.icons.BitmapInfo;
@@ -750,7 +751,9 @@
      * Cache class to store the actual entries on disk
      */
     public static final class IconDB extends SQLiteCacheHelper {
-        private static final int RELEASE_VERSION = 34;
+        // Ensures archived app icons are invalidated after flag is flipped.
+        // TODO: Remove conditional with FLAG_USE_NEW_ICON_FOR_ARCHIVED_APPS
+        private static final int RELEASE_VERSION = Flags.useNewIconForArchivedApps() ? 35 : 34;
 
         public static final String TABLE_NAME = "icons";
         public static final String COLUMN_ROWID = "rowid";