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

Unverified Commit 80cbcb47 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-security-13.0.0_r9' of... 

Merge tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/packages/apps/Launcher3 into staging/lineage-20.0_merge_android-security-13.0.0_r9

Android security 13.0.0 release 9

* tag 'android-security-13.0.0_r9' of https://android.googlesource.com/platform/packages/apps/Launcher3:
  Fix permission issue in legacy shortcut

Change-Id: I783d680052a324dbe46d3ca716cf7b2c11a95f3d
parents f1b03d52 0e3f63d3

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

+12 −0
Original line number Diff line number Diff line
@@ -145,6 +145,18 @@ public class PackageManagerHelper { 
     * any permissions

     */

    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;

            }

        }

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

        if (target == null) {

            // Not a valid target