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

Commit baafdbf3 authored by Song Hu's avatar Song Hu
Browse files

In getMatchingShareTargets, add callerLauncher to fetch sharesheet marked pin info. 

Bug: 210453009
Test: test on the local phone
Change-Id: Icafbc1a632cbfb3db2ccd8a7ba2619f7bbc17a0d
parent 5774ec07

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

+5 −1
Original line number Diff line number Diff line
@@ -897,8 +897,12 @@ class ShortcutPackage extends ShortcutPackageItem { 


        // Get the list of all dynamic shortcuts in this package.

        final ArrayList<ShortcutInfo> shortcuts = new ArrayList<>();

        // Pass callingLauncher to ensure pinned flag marked by system ui, e.g. ShareSheet, are

        // included in the result

        findAll(shortcuts, ShortcutInfo::isNonManifestVisible,

                ShortcutInfo.CLONE_REMOVE_FOR_APP_PREDICTION);

                ShortcutInfo.CLONE_REMOVE_FOR_APP_PREDICTION,

                mShortcutUser.mService.mContext.getPackageName(),

                0, /*getPinnedByAnyLauncher=*/ false);



        final List<ShortcutManager.ShareShortcutInfo> result = new ArrayList<>();

        for (int i = 0; i < shortcuts.size(); i++) {