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

Commit c1dc70fd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "In getMatchingShareTargets, add callerLauncher to fetch sharesheet... 

Merge "In getMatchingShareTargets, add callerLauncher to fetch sharesheet marked pin info." into tm-dev am: f1b91f63 am: 554b4858

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891146



Change-Id: Ibae88fa870b3ba42690a74907e865c652bf8ccc7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0695e750 554b4858

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

+5 −1
Original line number Diff line number Diff line
@@ -894,8 +894,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++) {

services/tests/servicestests/src/com/android/server/pm/BaseShortcutManagerTest.java

+6 −0
Original line number Diff line number Diff line
@@ -266,6 +266,11 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 
        public void sendIntentSender(IntentSender intent) {

            // Placeholder for spying.

        }



        @Override

        public String getPackageName() {

            return SYSTEM_PACKAGE_NAME;

        }

    }



    /** ShortcutService with injection override methods. */
@@ -704,6 +709,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase { 


    protected UriPermissionOwner mUriPermissionOwner;



    protected static final String SYSTEM_PACKAGE_NAME = "android";



    protected static final String CALLING_PACKAGE_1 = "com.android.test.1";

    protected static final int CALLING_UID_1 = 10001;