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

Commit f4e2e260 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev 

am: 9c39da39

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
parents 9173362f 9c39da39

src/com/android/settings/ActivityPicker.java

+4 −0
Original line number Diff line number Diff line
@@ -78,6 +78,10 @@ public class ActivityPicker extends AlertActivity implements 
        Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);

        if (parcel instanceof Intent) {

            mBaseIntent = (Intent) parcel;

            mBaseIntent.setFlags(mBaseIntent.getFlags() & ~(Intent.FLAG_GRANT_READ_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION));

        } else {

            mBaseIntent = new Intent(Intent.ACTION_MAIN, null);

            mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT);