Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "In getMatchingShareTargets, add callerLauncher to fetch sharesheet marked pin info." into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-21 22:16:14 +00:00
committed by Android (Google) Code Review
parent e5f9c3da5c fe3f81eb61
commit f1b91f6314
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/ShortcutPackage.java
View File

@@ -894,8 +894,12 @@ class ShortcutPackage extends ShortcutPackageItem {
// Get the list of all dynamic shortcuts in this package. // Get the list of all dynamic shortcuts in this package.
final ArrayList<ShortcutInfo> shortcuts = new ArrayList<>(); 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, 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<>(); final List<ShortcutManager.ShareShortcutInfo> result = new ArrayList<>();
for (int i = 0; i < shortcuts.size(); i++) { for (int i = 0; i < shortcuts.size(); i++) {

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

@@ -266,6 +266,11 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
public void sendIntentSender(IntentSender intent) { public void sendIntentSender(IntentSender intent) {
// Placeholder for spying. // Placeholder for spying.
} }
@Override
public String getPackageName() {
return SYSTEM_PACKAGE_NAME;
}
} }
/** ShortcutService with injection override methods. */ /** ShortcutService with injection override methods. */
@@ -704,6 +709,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
protected UriPermissionOwner mUriPermissionOwner; 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 String CALLING_PACKAGE_1 = "com.android.test.1";
protected static final int CALLING_UID_1 = 10001; protected static final int CALLING_UID_1 = 10001;