From 8079af097b1bc241976b2b1a567faa2e67160438 Mon Sep 17 00:00:00 2001 From: MrSluffy Date: Thu, 5 Dec 2024 07:59:04 +0800 Subject: [PATCH] fixed java.lang.NoSuchFieldError: No instance field isArchived of type --- src/com/android/launcher3/icons/IconCache.java | 2 +- .../launcher3/model/ItemInstallQueue.java | 10 +++++++--- .../launcher3/model/PackageUpdatedTask.java | 17 +++++++++++------ .../android/launcher3/model/data/AppInfo.java | 2 +- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java index fe1ce189fd..702a590518 100644 --- a/src/com/android/launcher3/icons/IconCache.java +++ b/src/com/android/launcher3/icons/IconCache.java @@ -264,7 +264,7 @@ public class IconCache extends BaseIconCache { try { isAppArchived = Flags.enableSupportForArchiving() && activityInfo != null && activityInfo.getActivityInfo().isArchived; - } catch (NoSuchMethodError e) { + } catch (Throwable e) { isAppArchived = false; } // If we already have activity info, no need to use package icon diff --git a/src/com/android/launcher3/model/ItemInstallQueue.java b/src/com/android/launcher3/model/ItemInstallQueue.java index 551c2d8ba8..6dc38d5aa5 100644 --- a/src/com/android/launcher3/model/ItemInstallQueue.java +++ b/src/com/android/launcher3/model/ItemInstallQueue.java @@ -304,9 +304,13 @@ public class ItemInstallQueue implements SafeCloseable { } else { lai = laiList.get(0); si.intent = makeLaunchIntent(lai); - if (Flags.enableSupportForArchiving() - && lai.getActivityInfo().isArchived) { - si.runtimeStatusFlags |= FLAG_ARCHIVED; + try { + if (Flags.enableSupportForArchiving() + && lai.getActivityInfo().isArchived) { + si.runtimeStatusFlags |= FLAG_ARCHIVED; + } + } catch (Throwable t) { + // ignore } } LauncherAppState.getInstance(context).getIconCache() diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index 15024ce403..e8b30f015d 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java @@ -337,14 +337,19 @@ public class PackageUpdatedTask implements ModelUpdateTask { PackageInstallInfo.STATUS_INSTALLED_DOWNLOADING); // In case an app is archived, we need to make sure that archived state // in WorkspaceItemInfo is refreshed. - if (Flags.enableSupportForArchiving() && !activities.isEmpty()) { - boolean newArchivalState = activities.get( - 0).getActivityInfo().isArchived; - if (newArchivalState != si.isArchived()) { - si.runtimeStatusFlags ^= FLAG_ARCHIVED; - infoUpdated = true; + try { + if (Flags.enableSupportForArchiving() && !activities.isEmpty()) { + boolean newArchivalState = activities.get( + 0).getActivityInfo().isArchived; + if (newArchivalState != si.isArchived()) { + si.runtimeStatusFlags ^= FLAG_ARCHIVED; + infoUpdated = true; + } } + } catch (Throwable t) { + // ignore } + if (si.itemType == Favorites.ITEM_TYPE_APPLICATION) { if (activities != null && !activities.isEmpty()) { si.setNonResizeable(ApiWrapper.INSTANCE.get(context) diff --git a/src/com/android/launcher3/model/data/AppInfo.java b/src/com/android/launcher3/model/data/AppInfo.java index 1c2bb6ae1b..8d65e76144 100644 --- a/src/com/android/launcher3/model/data/AppInfo.java +++ b/src/com/android/launcher3/model/data/AppInfo.java @@ -208,7 +208,7 @@ public class AppInfo extends ItemInfoWithIcon implements WorkspaceItemFactory { } else { info.runtimeStatusFlags &= ~FLAG_ARCHIVED; } - } catch (NoSuchMethodError e) { + } catch (Throwable t) { // Ignore } }