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

Commit 0e3f63d3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23526090']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23526090'] into security-aosp-tm-release.

Change-Id: I77cd1c4cd6cbc3962779bae9141641fa1be06c39
parents 4d098abb 09f8b0e5

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

+12 −0
Original line number Diff line number Diff line
@@ -136,6 +136,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