From 8e1ddd7d8c3497bfe5de8559ae1380f51fc8361b Mon Sep 17 00:00:00 2001 From: Mehdi Alizadeh Date: Thu, 30 Apr 2020 17:51:37 -0700 Subject: [PATCH] Fixes the wrong error logs for shortcut ranks (false alarm) Bug: 155443629 Test: Verify that all ShortcutManager tests pass the status check. Change-Id: Iaac28b385782c82c03e44b937ca1871b40e30e94 --- .../core/java/com/android/server/pm/ShortcutPackage.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java index 71a4bb4319859..322763e36ab90 100644 --- a/services/core/java/com/android/server/pm/ShortcutPackage.java +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -1444,10 +1444,6 @@ class ShortcutPackage extends ShortcutPackageItem { // Don't adjust ranks for manifest shortcuts. continue; } - if (si.isCached() && !si.isDynamic()) { - // Don't adjust ranks for cached shortcuts that are not dynamic anymore. - continue; - } // At this point, it must be dynamic. if (!si.isDynamic()) { s.wtf("Non-dynamic shortcut found."); @@ -1984,7 +1980,7 @@ class ShortcutPackage extends ShortcutPackageItem { dynamicList.removeIf((si) -> !si.isDynamic()); final ArrayList manifestList = new ArrayList<>(list); - dynamicList.removeIf((si) -> !si.isManifestShortcut()); + manifestList.removeIf((si) -> !si.isManifestShortcut()); verifyRanksSequential(dynamicList); verifyRanksSequential(manifestList);