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

Commit b9fea93b authored by Pinyao Ting's avatar Pinyao Ting Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: Ifd46f1fc73f5701d53635de42e7cdc85a7a04941
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 308dfc60 8613e9d3

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

+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<>();