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

Commit 678d04f1 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Copy EXTRA_STREAM into ClipData and grant. 

When sending SEND or SEND_MULTIPLE intents, copy any EXTRA_STREAM
Uris to ClipData and set GRANT_READ_URI_PERMISSION flag.

Bug: 6216357
Change-Id: I3c9b0d1d4b7e0c4655b47c4192150b0c3641e0e8
parent b9a07018

core/java/android/app/Instrumentation.java

+2 −0
Original line number Diff line number Diff line
@@ -1381,6 +1381,7 @@ public class Instrumentation { 
        }

        try {

            intent.setAllowFds(false);

            intent.migrateExtraStreamToClipData();

            int result = ActivityManagerNative.getDefault()

                .startActivity(whoThread, intent,

                        intent.resolveTypeIfNeeded(who.getContentResolver()),
@@ -1479,6 +1480,7 @@ public class Instrumentation { 
        }

        try {

            intent.setAllowFds(false);

            intent.migrateExtraStreamToClipData();

            int result = ActivityManagerNative.getDefault()

                .startActivity(whoThread, intent,

                        intent.resolveTypeIfNeeded(who.getContentResolver()),

core/java/android/content/Intent.java

+42 −0
Original line number Diff line number Diff line
@@ -6467,4 +6467,46 @@ public class Intent implements Parcelable, Cloneable { 
        }

        return type;

    }



    /**

     * Migrate any {@link #EXTRA_STREAM} in {@link #ACTION_SEND} and

     * {@link #ACTION_SEND_MULTIPLE} to {@link ClipData}.

     *

     * @hide

     */

    public void migrateExtraStreamToClipData() {

        // Refuse to touch if extras already parcelled

        if (mExtras != null && mExtras.isParcelled()) return;



        // Bail when someone already gave us ClipData

        if (getClipData() != null) return;



        final String action = getAction();

        if (ACTION_SEND.equals(action)) {

            final Uri stream = getParcelableExtra(EXTRA_STREAM);

            if (stream != null) {

                final ClipData clipData = new ClipData(

                        null, new String[] { getType() }, new ClipData.Item(stream));



                setClipData(clipData);

                addFlags(FLAG_GRANT_READ_URI_PERMISSION);

            }



        } else if (ACTION_SEND_MULTIPLE.equals(action)) {

            final ArrayList<Uri> streams = getParcelableArrayListExtra(EXTRA_STREAM);

            if (streams != null && streams.size() > 0) {

                final Uri firstStream = streams.get(0);

                final ClipData clipData = new ClipData(

                        null, new String[] { getType() }, new ClipData.Item(firstStream));



                final int size = streams.size();

                for (int i = 1; i < size; i++) {

                    clipData.addItem(new ClipData.Item(streams.get(i)));

                }



                setClipData(clipData);

                addFlags(FLAG_GRANT_READ_URI_PERMISSION);

            }

        }

    }

}

core/java/android/os/Bundle.java

+7 −0
Original line number Diff line number Diff line
@@ -225,6 +225,13 @@ public final class Bundle implements Parcelable, Cloneable { 
        mParcelledData = null;

    }



    /**

     * @hide

     */

    public boolean isParcelled() {

        return mParcelledData != null;

    }



    /**

     * Returns the number of mappings contained in this Bundle.

     *