Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Guard against apps breaking CHOOSER contract." into jb-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2012-05-18 14:20:02 -07:00
committed by Android (Google) Code Review
parent e312c61f93 1c29700c5f
commit 9cb660fa34
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/java/android/content/Intent.java
View File

@@ -6653,17 +6653,20 @@ public class Intent implements Parcelable, Cloneable {
final String action = getAction();
if (ACTION_CHOOSER.equals(action)) {
// Inspect target intent to see if we need to migrate
final Intent target = getParcelableExtra(EXTRA_INTENT);
if (target.migrateExtraStreamToClipData()) {
// Since we migrated in child, we need to promote ClipData and
// flags to ourselves to grant.
setClipData(target.getClipData());
addFlags(target.getFlags()
& (FLAG_GRANT_READ_URI_PERMISSION | FLAG_GRANT_WRITE_URI_PERMISSION));
return true;
} else {
return false;
try {
// Inspect target intent to see if we need to migrate
final Intent target = getParcelableExtra(EXTRA_INTENT);
if (target != null && target.migrateExtraStreamToClipData()) {
// Since we migrated in child, we need to promote ClipData
// and flags to ourselves to grant.
setClipData(target.getClipData());
addFlags(target.getFlags()
& (FLAG_GRANT_READ_URI_PERMISSION | FLAG_GRANT_WRITE_URI_PERMISSION));
return true;
} else {
return false;
}
} catch (ClassCastException e) {
}
} else if (ACTION_SEND.equals(action)) {