Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixes the wrong error logs for shortcut ranks (false alarm)" into rvc-dev

Browse Source
This commit is contained in:
Mehdi Alizadeh
2020-05-20 20:48:08 +00:00
committed by Android (Google) Code Review
parent 315edf11f8 8e1ddd7d8c
commit 6815d60d0a
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -1444,10 +1444,6 @@ class ShortcutPackage extends ShortcutPackageItem {
// Don't adjust ranks for manifest shortcuts. // Don't adjust ranks for manifest shortcuts.
continue; 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. // At this point, it must be dynamic.
if (!si.isDynamic()) { if (!si.isDynamic()) {
s.wtf("Non-dynamic shortcut found."); s.wtf("Non-dynamic shortcut found.");
@@ -1984,7 +1980,7 @@ class ShortcutPackage extends ShortcutPackageItem {
dynamicList.removeIf((si) -> !si.isDynamic()); dynamicList.removeIf((si) -> !si.isDynamic());
final ArrayList<ShortcutInfo> manifestList = new ArrayList<>(list); final ArrayList<ShortcutInfo> manifestList = new ArrayList<>(list);
dynamicList.removeIf((si) -> !si.isManifestShortcut()); manifestList.removeIf((si) -> !si.isManifestShortcut());
verifyRanksSequential(dynamicList); verifyRanksSequential(dynamicList);
verifyRanksSequential(manifestList); verifyRanksSequential(manifestList);