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

Commit 37490462 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev

parents 8fb120b6 ecba2e4b

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -11884,6 +11884,7 @@ package android.media { 
    ctor public MediaExtractor();

    method public boolean advance();

    method public long getCachedDuration();

    method public java.util.Map<java.util.UUID, byte[]> getPsshInfo();

    method public boolean getSampleCryptoInfo(android.media.MediaCodec.CryptoInfo);

    method public int getSampleFlags();

    method public long getSampleTime();

media/java/android/media/MediaExtractor.java

+2 −2
Original line number Diff line number Diff line
@@ -199,9 +199,9 @@ final public class MediaExtractor { 
    public native final int getTrackCount();



    /**

     * Get the PSSH info if present. This returns a map of uuid-to-bytes, with the uuid specifying

     * Get the PSSH info if present.

     * @return a map of uuid-to-bytes, with the uuid specifying

     * the crypto scheme, and the bytes being the data specific to that scheme.

     * {@hide}

     */

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

        Map<UUID, byte[]> psshMap = null;