commit 556688abdb3725920e28844babf94a3f5b38f873
author Jeff Sharkey <jsharkey@android.com> Wed Oct 11 20:26:40 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 11 20:26:40 2017 +0000
tree bc46e97be562d25cb6cabcfaa9cd8e9791a98f63
parent cf0caf8f227827c125f0d388307331c8e297f9ed
parent 019f31b49919c4e10c45ed66b7c8327e57d73684

DO NOT MERGE. ActivityPicker shouldn't grant permissions.
am: 019f31b499

Change-Id: I755c046ad6392a7582d5afc32bd1e4693bcae33e

src/com/android/settings/ActivityPicker.java

diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index 7c26923..97996c8 100644
--- a/src/com/android/settings/ActivityPicker.java
+++ b/src/com/android/settings/ActivityPicker.java
@@ -78,6 +78,10 @@
         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);