Merge "Allow ShortcutPackage#findAll to return cached shortcuts."

2020-12-12 02:30:15 +00:00
parent 7e05d5ef24 547c4f70c3
commit 0e097726f0
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/pm/ShortcutPackage.java
+++ b/services/core/java/com/android/server/pm/ShortcutPackage.java
@@ -737,7 +737,7 @@ class ShortcutPackage extends ShortcutPackageItem {
                    || ((pinnedByCallerSet != null) && pinnedByCallerSet.contains(si.getId()));

            if (!getPinnedByAnyLauncher) {
-                if (si.isFloating()) {
+                if (si.isFloating() && !si.isCached()) {
                    if (!isPinnedByCaller) {
                        continue;
                    }