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

Commit 96757556 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

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

Change-Id: I2c91d844fb89b21cc3c91b46f062fca273493fd9
parents f22129fa eb7ace0b

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

+3 −0
Original line number Diff line number Diff line
@@ -2419,6 +2419,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");