Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d65e85e authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Merge commit '3bc83eb0' into downstream 

Change-Id: Id3980b39889f28ab42284119747eb461be0a3ce5
parents 81c3a01e d8d8363d

src/com/android/documentsui/DocumentsActivity.java

+5 −4
Original line number Diff line number Diff line
@@ -722,13 +722,14 @@ 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.

        } 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);

            intent.putExtra(CopyService.EXTRA_TRANSFER_MODE, mState.transferMode);

        } else {