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

Commit 7454253d authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Unhide MediaPlayer's setDataSource method that takes optional http headers to be"

parents c199ff64 72e738a4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -10013,6 +10013,7 @@ package android.media { 
    method public void setAudioStreamType(int);

    method public void setAuxEffectSendLevel(float);

    method public void setDataSource(android.content.Context, android.net.Uri) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

    method public void setDataSource(android.content.Context, android.net.Uri, java.util.Map<java.lang.String, java.lang.String>) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException, java.lang.SecurityException;

    method public void setDataSource(java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDataSource(java.io.FileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

    method public void setDataSource(java.io.FileDescriptor, long, long) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

media/java/android/media/MediaPlayer.java

+0 −1
Original line number Diff line number Diff line
@@ -745,7 +745,6 @@ public class MediaPlayer 
     * @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

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

     * @hide pending API council

     */

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

        throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {