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

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

Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev

parents 01028b6f f86374ad

api/current.txt

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

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

    field public static final int SAMPLE_FLAG_SYNC = 1; // 0x1

    field public static final int SEEK_TO_CLOSEST = 3; // 0x3

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

    field public static final int SEEK_TO_NEXT_SYNC = 1; // 0x1

    field public static final int SEEK_TO_PREVIOUS_SYNC = 0; // 0x0

media/java/android/media/MediaExtractor.java

+0 −5
Original line number Diff line number Diff line
@@ -225,11 +225,6 @@ final public class MediaExtractor { 
     * If possible, seek to the sync sample closest to the specified time

     */

    public static final int SEEK_TO_CLOSEST_SYNC        = 2;

    /**

     * If possible, seek to a sample closest to the specified time, which may

     * NOT be a sync sample!

     */

    public static final int SEEK_TO_CLOSEST             = 3;



    /**

     * All selected tracks seek near the requested time according to the

media/jni/android_media_MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ static void android_media_MediaExtractor_seekTo( 
    }



    if (mode < MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC

            || mode > MediaSource::ReadOptions::SEEK_CLOSEST) {

            || mode >= MediaSource::ReadOptions::SEEK_CLOSEST) {

        jniThrowException(env, "java/lang/IllegalArgumentException", NULL);

        return;

    }