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

Merge "Fix the issue shortcut cannot pinned in ShareSheet" into udc-dev am: dff2d185f2

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

Change-Id: Iecb10d2f7506fe045c62d75851cdfc1febabd8ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Pinyao Ting
2023-06-07 17:19:57 +00:00
committed by Automerger Merge Worker
parent 297cb2b23c dff2d185f2
commit 8613e9d36e
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/pm/ShortcutService.java
View File

@@ -2547,10 +2547,7 @@ public class ShortcutService extends IShortcutService.Stub {
enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS, enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS,
"getShareTargets"); "getShareTargets");
final ComponentName chooser = injectChooserActivity(); final ComponentName chooser = injectChooserActivity();
final String pkg = (chooser != null final String pkg = chooser != null ? chooser.getPackageName() : mContext.getPackageName();
&& mPackageManagerInternal.getComponentEnabledSetting(chooser,
injectBinderCallingUid(), userId) == PackageManager.COMPONENT_ENABLED_STATE_ENABLED)
? chooser.getPackageName() : mContext.getPackageName();
synchronized (mLock) { synchronized (mLock) {
throwIfUserLockedL(userId); throwIfUserLockedL(userId);
final List<ShortcutManager.ShareShortcutInfo> shortcutInfoList = new ArrayList<>(); final List<ShortcutManager.ShareShortcutInfo> shortcutInfoList = new ArrayList<>();