Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e1ddd7d authored by Mehdi Alizadeh's avatar Mehdi Alizadeh
Browse files

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
parent a1ad29da

services/core/java/com/android/server/pm/ShortcutPackage.java

+1 −5
Original line number Diff line number Diff line
@@ -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<ShortcutInfo> manifestList = new ArrayList<>(list);

            dynamicList.removeIf((si) -> !si.isManifestShortcut());

            manifestList.removeIf((si) -> !si.isManifestShortcut());



            verifyRanksSequential(dynamicList);

            verifyRanksSequential(manifestList);