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

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

Merge "Adds null checks to ShortcutManager#getShareTargets()" into rvc-dev am:... 

Merge "Adds null checks to ShortcutManager#getShareTargets()" into rvc-dev am: 843f071d am: eb7ace0b am: 96757556 am: e615caf4

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

Change-Id: I7cf20d5a46af4c4034073569898c21bf9d384e10
parents 0300eedb e615caf4

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

+3 −0
Original line number Diff line number Diff line
@@ -2431,6 +2431,9 @@ public class ShortcutService extends IShortcutService.Stub { 
    @Override

    public ParceledListSlice<ShortcutManager.ShareShortcutInfo> getShareTargets(String packageName,

            IntentFilter filter, @UserIdInt int userId) {

        Preconditions.checkStringNotEmpty(packageName, "packageName");

        Objects.requireNonNull(filter, "intentFilter");



        verifyCaller(packageName, userId);

        enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_APP_PREDICTIONS,

                "getShareTargets");