From b6b27a497ea95387c41f0e44ae54d22baa19ba96 Mon Sep 17 00:00:00 2001 From: Rohit Goyal Date: Wed, 21 Feb 2024 13:12:02 +0000 Subject: [PATCH] Bugfix: Ensure archived app icons persist when app main activity name changes post unarchival. * In case app main activity changes, archived app icon should not disappear. * We need to make sure the corresponding new intent is applied correctly to the app icon on activity name change. Test: verified bugfix locally. Bug: 324545643 Bug: 325458020 Flag: ACONFIG com.android.launcher3.enable_support_for_archiving DEVELOPMENT Change-Id: I0134e57e3536d05fc96c8cfcf5f57fd8f4df5f1f --- src/com/android/launcher3/model/PackageUpdatedTask.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index a41b663432..4d06c2e079 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -240,8 +240,9 @@ public class PackageUpdatedTask extends BaseModelUpdateTask { isTargetValid = context.getSystemService(LauncherApps.class) .isActivityEnabled(cn, mUser); } - if (!isTargetValid && si.hasStatusFlag( - FLAG_RESTORED_ICON | FLAG_AUTOINSTALL_ICON)) { + if (!isTargetValid && (si.hasStatusFlag( + FLAG_RESTORED_ICON | FLAG_AUTOINSTALL_ICON) + || si.isArchived())) { if (updateWorkspaceItemIntent(context, si, packageName)) { infoUpdated = true; } else if (si.hasPromiseIconUi()) {