commit 9c39da39dfdf4ece1cd49dfefd5362a04812b65a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Oct 11 20:32:55 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 11 20:32:55 2017 +0000
tree 2a33537b3629c8312bf0bd9f8e255f637ff0a819
parent 70387afef975dab60962738ca53744f48b94f6d7
parent b5e93969a5e0c3a3f07e068dbc763cdd995a0e21

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

src/com/android/settings/ActivityPicker.java

diff --git a/src/com/android/settings/ActivityPicker.java b/src/com/android/settings/ActivityPicker.java
index 2c3436f..ae61944 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);