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

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

Merge tag 'android-security-11.0.0_r74' into staging/lineage-18.1_android-security-11.0.0_r74 

Android Security 11.0.0 Release 74 (10993236)

* tag 'android-security-11.0.0_r74':
  Fix permission bypass in legacy shortcut

Change-Id: If2a42b6cef97b7735471b5d31640c35efc59f4b1
parents 1cadce9a 64a4202d

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

+2 −9
Original line number Diff line number Diff line
@@ -155,15 +155,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) {