diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2015-07-15 18:02:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-15 18:02:55 +0000 |
| commit | 483bd84280ef667e306ec7246d85423ca6b1fde7 (patch) | |
| tree | e8c72e77c5b7f5f6b27e5d356b54e2287e83186b | |
| parent | 1d4247c4cc89c6d62e44ed3115f26579979b44b5 (diff) | |
| parent | 04ec6f4f092f1c2d56ef6213019ce4b9068b8a0a (diff) | |
| download | frameworks_base-483bd84280ef667e306ec7246d85423ca6b1fde7.zip frameworks_base-483bd84280ef667e306ec7246d85423ca6b1fde7.tar.gz frameworks_base-483bd84280ef667e306ec7246d85423ca6b1fde7.tar.bz2 | |
Merge "Only send EXTRA_STACK for private intent." into mnc-dev
| -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 |