OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6f3ea1a
)
DO NOT MERGE. ActivityPicker shouldn't grant permissions.
author
Jeff Sharkey
<jsharkey@android.com>
Mon, 12 Jun 2017 23:33:58 +0000
(17:33 -0600)
committer
JP Sugarbroad
<jpsugar@google.com>
Thu, 19 Oct 2017 20:01:45 +0000
(13:01 -0700)
This picker has no business granting any Uri permissions, so remove
any grant flags that malicious apps may have tried sneaking in.
Test: builds, boots
Bug:
32879772
Change-Id: I91c48c73287a271bd6c99e60e216dead22e68764
(cherry picked from commit
3f218e8431cb5648bcb46131551c133ba53ef870
)
(cherry picked from commit
8441943bfa1dd72fad25ae9d20851b871dd9c143
)
src/com/android/settings/ActivityPicker.java
patch
|
blob
|
history
diff --git
a/src/com/android/settings/ActivityPicker.java
b/src/com/android/settings/ActivityPicker.java
index
2c3436f
..
ae61944
100644
(file)
--- a/
src/com/android/settings/ActivityPicker.java
+++ b/
src/com/android/settings/ActivityPicker.java
@@
-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);