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

Commit f223fd71 authored by Santiago Seifert's avatar Santiago Seifert Committed by Android (Google) Code Review
Browse files

Merge "Deprecate MediaExtractor.setMediaCas"

parents d206f4b3 ebca37ec

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -22769,7 +22769,7 @@ package android.media { 
    method public void setDataSource(@NonNull java.io.FileDescriptor) throws java.io.IOException;

    method public void setDataSource(@NonNull java.io.FileDescriptor, long, long) throws java.io.IOException;

    method public void setLogSessionId(@NonNull android.media.metrics.LogSessionId);

    method public void setMediaCas(@NonNull android.media.MediaCas);

    method @Deprecated public void setMediaCas(@NonNull android.media.MediaCas);

    method public void unselectTrack(int);

    field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2

    field public static final int SAMPLE_FLAG_PARTIAL_FRAME = 4; // 0x4

media/java/android/media/MediaExtractor.java

+3 −8
Original line number Diff line number Diff line
@@ -250,15 +250,10 @@ public final class MediaExtractor { 
            @NonNull FileDescriptor fd, long offset, long length) throws IOException;



    /**

     * Sets the MediaCas instance to use. This should be called after a

     * successful setDataSource() if at least one track reports mime type

     * of {@link android.media.MediaFormat#MIMETYPE_AUDIO_SCRAMBLED}

     * or {@link android.media.MediaFormat#MIMETYPE_VIDEO_SCRAMBLED}.

     * Stream parsing will not proceed until a valid MediaCas object

     * is provided.

     *

     * @param mediaCas the MediaCas object to use.

     * @deprecated Use the {@code Descrambler} system API instead, or DRM public APIs like

     *             {@link MediaDrm}.

     */

    @Deprecated

    public final void setMediaCas(@NonNull MediaCas mediaCas) {

        mMediaCas = mediaCas;

        nativeSetMediaCas(mediaCas.getBinder());