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

Commit 88c3812c authored by Song Hu's avatar Song Hu Committed by Android (Google) Code Review
Browse files

Merge "Support floating but long-lived shortcuts to be pinned in... 

Merge "Support floating but long-lived shortcuts to be pinned in ShortcutLauncher. Floating shortcuts can surface on sharesheet to be pinned." into tm-qpr-dev
parents e1a1ace2 1eab8cb6

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

+3 −3
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ class ShortcutLauncher extends ShortcutPackageItem { 
            final ArraySet<String> prevSet = mPinnedShortcuts.get(pu);



            // Actually pin shortcuts.

            // This logic here is to make sure a launcher cannot pin a shortcut that is floating

            // (i.e. not dynamic nor manifest but is pinned) and pinned by another launcher.

            // This logic here is to make sure a launcher cannot pin a shortcut that is not dynamic

            // nor long-lived nor manifest but is pinned.

            // In this case, technically the shortcut doesn't exist to this launcher, so it can't

            // pin it.

            // (Maybe unnecessarily strict...)
@@ -158,7 +158,7 @@ class ShortcutLauncher extends ShortcutPackageItem { 
                if (si == null) {

                    continue;

                }

                if (si.isDynamic()

                if (si.isDynamic() || si.isLongLived()

                        || si.isManifestShortcut()

                        || (prevSet != null && prevSet.contains(id))

                        || forPinRequest) {