Merge "Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no" into jb-dev
diff --git a/api/current.txt b/api/current.txt
index 846c2b7..ec3d54a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11236,7 +11236,6 @@
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
diff --git a/media/java/android/media/MediaExtractor.java b/media/java/android/media/MediaExtractor.java
index 58b30db..d3a00c2 100644
--- a/media/java/android/media/MediaExtractor.java
+++ b/media/java/android/media/MediaExtractor.java
@@ -225,11 +225,6 @@
* 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
diff --git a/media/jni/android_media_MediaExtractor.cpp b/media/jni/android_media_MediaExtractor.cpp
index c93baf1..351ff04 100644
--- a/media/jni/android_media_MediaExtractor.cpp
+++ b/media/jni/android_media_MediaExtractor.cpp
@@ -313,7 +313,7 @@
}
if (mode < MediaSource::ReadOptions::SEEK_PREVIOUS_SYNC
- || mode > MediaSource::ReadOptions::SEEK_CLOSEST) {
+ || mode >= MediaSource::ReadOptions::SEEK_CLOSEST) {
jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
return;
}