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

Commit d8d8363d authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for... 

am b5405b45: am 350b99c0: am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev

* commit 'b5405b45784cebf978b6102d324a1018fe66deb6':
  Only send EXTRA_STACK for private intent.
parents d4c15ced d773c437

src/com/android/documentsui/DocumentsActivity.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -720,13 +720,14 @@ public class DocumentsActivity extends BaseActivity { 




        if (mState.action == ACTION_GET_CONTENT) {

        if (mState.action == ACTION_GET_CONTENT) {

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

        } else if (mState.action == ACTION_OPEN_TREE ||

        } else if (mState.action == ACTION_OPEN_TREE) {

                   mState.action == ACTION_OPEN_COPY_DESTINATION) {

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION

                    | Intent.FLAG_GRANT_WRITE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION

                    | Intent.FLAG_GRANT_PREFIX_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_STACK, (Parcelable) mState.stack);

        } else {

        } else {

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION

            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION