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

Commit d321eb77 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by Automerger Merge Worker
Browse files

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

Change-Id: I09e8131e06795b6c071ff68df33994386b5908dc
parents dbe16101 6815d60d

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);