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

Commit 652d006d authored by Hassan Shojania's avatar Hassan Shojania Committed by Android (Google) Code Review
Browse files

Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev

parents bb21986b 5167ede2

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22785,7 +22785,7 @@ package android.media { 
    method public deprecated 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>, java.util.List<java.net.HttpCookie>) 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>, java.util.List<java.net.HttpCookie>) throws java.io.IOException;

    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, java.lang.SecurityException;

    method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -24621,7 +24621,7 @@ package android.media { 
    method public deprecated 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>, java.util.List<java.net.HttpCookie>) 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>, java.util.List<java.net.HttpCookie>) throws java.io.IOException;

    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, java.lang.SecurityException;

    method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22892,7 +22892,7 @@ package android.media { 
    method public deprecated 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>, java.util.List<java.net.HttpCookie>) 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>, java.util.List<java.net.HttpCookie>) throws java.io.IOException;

    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, java.lang.SecurityException;

    method public void setDataSource(android.content.res.AssetFileDescriptor) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;

media/java/android/media/MediaPlayer.java

+23 −1
Original line number Diff line number Diff line
@@ -1010,6 +1010,8 @@ public class MediaPlayer extends PlayerBase 
     *                The headers must not include cookies. Instead, use the cookies param.

     * @param cookies the cookies to be sent together with the request

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

     * @throws NullPointerException  if context or uri is null

     * @throws IOException           if uri has a file scheme and an I/O error occurs

     *

     * <p><strong>Note</strong> that the cross domain redirection is allowed by default,

     * but that can be changed with key/value pairs through the headers parameter with
@@ -1018,7 +1020,15 @@ public class MediaPlayer extends PlayerBase 
     */

    public void setDataSource(@NonNull Context context, @NonNull Uri uri,

            @Nullable Map<String, String> headers, @Nullable List<HttpCookie> cookies)

            throws IOException, IllegalArgumentException, SecurityException, IllegalStateException {

            throws IOException {

        if (context == null) {

            throw new NullPointerException("context param can not be null.");

        }



        if (uri == null) {

            throw new NullPointerException("uri param can not be null.");

        }



        // The context and URI usually belong to the calling user. Get a resolver for that user

        // and strip out the userId from the URI if present.

        final ContentResolver resolver = context.getContentResolver();
@@ -4624,13 +4634,25 @@ public class MediaPlayer extends PlayerBase 
        }   // synchronized

    }



    /**

     * Encapsulates the DRM properties of the source.

     */

    public static final class DrmInfo {

        private Map<UUID, byte[]> mapPssh;

        private UUID[] supportedSchemes;



        /**

         * Returns the PSSH info of the data source for each supported DRM scheme.

         */

        public Map<UUID, byte[]> getPssh() {

            return mapPssh;

        }



        /**

         * Returns the intersection of the data source and the device DRM schemes.

         * It effectively identifies the subset of the source's DRM schemes which

         * are supported by the device too.

         */

        public UUID[] getSupportedSchemes() {

            return supportedSchemes;

        }