diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-15 21:43:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 21:43:48 +0000 |
| commit | 350b99c0027902db22004ea037265349155d7c38 (patch) | |
| tree | 2974a36fb3f69fe787672ce92487701e272f190f /packages/DocumentsUI | |
| parent | c7b0435cc709c328da8e2b515ea04c8bc40d1094 (diff) | |
| parent | 483bd84280ef667e306ec7246d85423ca6b1fde7 (diff) | |
| download | frameworks_base-350b99c0027902db22004ea037265349155d7c38.zip frameworks_base-350b99c0027902db22004ea037265349155d7c38.tar.gz frameworks_base-350b99c0027902db22004ea037265349155d7c38.tar.bz2 | |
am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev
* commit '483bd84280ef667e306ec7246d85423ca6b1fde7':
Only send EXTRA_STACK for private intent.
Diffstat (limited to 'packages/DocumentsUI')
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index c541bca..a57bcc6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -720,14 +720,15 @@ public class DocumentsActivity extends BaseActivity { if (mState.action == ACTION_GET_CONTENT) { intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); - } else if (mState.action == ACTION_OPEN_TREE || - mState.action == ACTION_OPEN_COPY_DESTINATION) { + } else if (mState.action == ACTION_OPEN_TREE) { intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION); - // TODO: Move passing the stack to the separate ACTION_COPY action once it's implemented. - intent.putExtra(CopyService.EXTRA_STACK, (Parcelable)mState.stack); + } else if (mState.action == ACTION_OPEN_COPY_DESTINATION) { + // Picking a copy destination is only used internally by us, so we + // don't need to extend permissions to the caller. + intent.putExtra(CopyService.EXTRA_STACK, (Parcelable) mState.stack); } else { intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION |