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

Commit dff2d185 authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

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

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