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

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

Fix permission bypass in legacy shortcut am: b7b192bd am: a30a52e7 am:... 

Fix permission bypass in legacy shortcut am: b7b192bd am: a30a52e7 am: 7446209d am: c08b5f47

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24751391



Change-Id: I91cfe8344b819d1ae94a7110f99e37b4b116e7dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2d76ce0 c08b5f47

src/com/android/launcher3/util/PackageManagerHelper.java

+2 −9
Original line number Diff line number Diff line
@@ -138,15 +138,8 @@ public class PackageManagerHelper { 
    public boolean hasPermissionForActivity(Intent intent, String srcPackage) {

        // b/270152142

        if (Intent.ACTION_CHOOSER.equals(intent.getAction())) {

            final Bundle extras = intent.getExtras();

            if (extras == null) {

                return true;

            }

            // If given intent is ACTION_CHOOSER, verify srcPackage has permission over EXTRA_INTENT

            intent = (Intent) extras.getParcelable(Intent.EXTRA_INTENT);

            if (intent == null) {

                return true;

            }

            // Chooser shortcuts is not a valid target

            return false;

        }

        ResolveInfo target = mPm.resolveActivity(intent, 0);

        if (target == null) {