PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 9c39da39df

Change-Id: Ic7566b0972c30c9e7b5a183888238eca44709d47
This commit is contained in:
Jeff Sharkey
2017-10-11 21:09:20 +00:00
committed by android-build-merger
parent 9173362f4e 9c39da39df
commit f4e2e26064
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/ActivityPicker.java
View File

@@ -78,6 +78,10 @@ public class ActivityPicker extends AlertActivity implements
Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT); Parcelable parcel = intent.getParcelableExtra(Intent.EXTRA_INTENT);
if (parcel instanceof Intent) { if (parcel instanceof Intent) {
mBaseIntent = (Intent) parcel; 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 { } else {
mBaseIntent = new Intent(Intent.ACTION_MAIN, null); mBaseIntent = new Intent(Intent.ACTION_MAIN, null);
mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT); mBaseIntent.addCategory(Intent.CATEGORY_DEFAULT);