| commit | ed7d1c052e37c9275b54a8b1f337100fa132929a | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jun 17 01:14:43 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 17 01:14:43 2021 +0000 |
| tree | a951a3492118bccb1d273785fdfeeca4da5cd803 | |
| parent | 853186578d472794f10f633b9518ad1751966e78 [diff] | |
| parent | 3115a4380b964278b9508533e9e397d9021d90f3 [diff] |
Merge "Fix broken app icon on restart during install." into sc-dev am: 3115a4380b Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15003917 Change-Id: I46100f030897500f8eeac3fe2421fbb515ac06ae
diff --git a/src/com/android/launcher3/model/PackageUpdatedTask.java b/src/com/android/launcher3/model/PackageUpdatedTask.java index 7bfa3ef..3c0a54a 100644 --- a/src/com/android/launcher3/model/PackageUpdatedTask.java +++ b/src/com/android/launcher3/model/PackageUpdatedTask.java
@@ -212,7 +212,8 @@ } if (si.isPromise() && isNewApkAvailable) { - boolean isTargetValid = true; + boolean isTargetValid = !cn.getClassName().equals( + IconCache.EMPTY_CLASS_NAME); if (si.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT) { List<ShortcutInfo> shortcut = new ShortcutRequest(context, mUser) @@ -225,7 +226,7 @@ si.updateFromDeepShortcutInfo(shortcut.get(0), context); infoUpdated = true; } - } else if (!cn.getClassName().equals(IconCache.EMPTY_CLASS_NAME)) { + } else if (isTargetValid) { isTargetValid = context.getSystemService(LauncherApps.class) .isActivityEnabled(cn, mUser); }