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

Commit a7118c9b authored by Ronghua Wu's avatar Ronghua Wu Committed by Android (Google) Code Review
Browse files

Merge "API: Document android-allow-cross-domain-redirect in MediaPlayer and VideoView" into lmp-dev

parents 9dfea28f 48db7834

core/java/android/widget/VideoView.java

+4 −0
Original line number Diff line number Diff line
@@ -253,6 +253,10 @@ public class VideoView extends SurfaceView 
     *

     * @param uri     the URI of the video.

     * @param headers the headers for the URI request.

     *                Note that the cross domain redirection is allowed by default, but that can be

     *                changed with key/value pairs through the headers parameter with

     *                "android-allow-cross-domain-redirect" as the key and "0" or "1" as the value

     *                to disallow or allow cross domain redirection.

     */

    public void setVideoURI(Uri uri, Map<String, String> headers) {

        mUri = uri;

media/java/android/media/MediaPlayer.java

+4 −0
Original line number Diff line number Diff line
@@ -961,6 +961,10 @@ public class MediaPlayer implements SubtitleController.Listener 
     * @param context the Context to use when resolving the Uri

     * @param uri the Content URI of the data you want to play

     * @param headers the headers to be sent together with the request for the data

     *                Note that the cross domain redirection is allowed by default, but that can be

     *                changed with key/value pairs through the headers parameter with

     *                "android-allow-cross-domain-redirect" as the key and "0" or "1" as the value

     *                to disallow or allow cross domain redirection.

     * @throws IllegalStateException if it is called in an invalid state

     */

    public void setDataSource(Context context, Uri uri, Map<String, String> headers)