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

am 3d7c4705: am bb44d63b: am 7526e81c: am ff48f1b3: am e50b0a6c: Merge "More ACTION_CHOOSER ClipData migration." into lmp-dev

Browse Source 
* commit '3d7c4705cf6c7884b412a147da67425217c832d1':
  More ACTION_CHOOSER ClipData migration.
This commit is contained in:
Jeff Sharkey
2014-09-24 17:17:33 +00:00
committed by Android Git Automerger
parent 0c62b9f217 93b178d90e
commit 105375ff66
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7498,23 +7498,32 @@ public class Intent implements Parcelable, Cloneable {
final String action = getAction();
if (ACTION_CHOOSER.equals(action)) {
// Inspect contained intents to see if we need to migrate extras. We
// don't promote ClipData to the parent, since ChooserActivity will
// already start the picked item as the caller, and we can't combine
// the flags in a safe way.
boolean migrated = 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
| FLAG_GRANT_PERSISTABLE_URI_PERMISSION
| FLAG_GRANT_PREFIX_URI_PERMISSION));
return true;
} else {
return false;
final Intent intent = getParcelableExtra(EXTRA_INTENT);
if (intent != null) {
migrated |= intent.migrateExtraStreamToClipData();
}
} catch (ClassCastException e) {
}
try {
final Parcelable[] intents = getParcelableArrayExtra(EXTRA_INITIAL_INTENTS);
if (intents != null) {
for (int i = 0; i < intents.length; i++) {
final Intent intent = (Intent) intents[i];
if (intent != null) {
migrated |= intent.migrateExtraStreamToClipData();
}
}
}
} catch (ClassCastException e) {
}
return migrated;
} else if (ACTION_SEND.equals(action)) {
try {