@@ -11138,13 +11138,19 @@ package android.media {
1113811138
1113911139 public class MediaPlayer {
1114011140 ctor public MediaPlayer();
11141+ method public void addTimedTextSource(java.lang.String, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
11142+ method public void addTimedTextSource(android.content.Context, android.net.Uri, java.lang.String) throws java.io.IOException, java.lang.IllegalArgumentException, java.lang.IllegalStateException;
11143+ method public void addTimedTextSource(java.io.FileDescriptor, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
11144+ method public void addTimedTextSource(java.io.FileDescriptor, long, long, java.lang.String) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
1114111145 method public void attachAuxEffect(int);
1114211146 method public static android.media.MediaPlayer create(android.content.Context, android.net.Uri);
1114311147 method public static android.media.MediaPlayer create(android.content.Context, android.net.Uri, android.view.SurfaceHolder);
1114411148 method public static android.media.MediaPlayer create(android.content.Context, int);
11149+ method public void deselectTrack(int) throws java.lang.IllegalStateException;
1114511150 method public int getAudioSessionId();
1114611151 method public int getCurrentPosition();
1114711152 method public int getDuration();
11153+ method public android.media.MediaPlayer.TrackInfo[] getTrackInfo() throws java.lang.IllegalStateException;
1114811154 method public int getVideoHeight();
1114911155 method public int getVideoWidth();
1115011156 method public boolean isLooping();
@@ -11155,6 +11161,7 @@ package android.media {
1115511161 method public void release();
1115611162 method public void reset();
1115711163 method public void seekTo(int) throws java.lang.IllegalStateException;
11164+ method public void selectTrack(int) throws java.lang.IllegalStateException;
1115811165 method public void setAudioSessionId(int) throws java.lang.IllegalArgumentException, java.lang.IllegalStateException;
1115911166 method public void setAudioStreamType(int);
1116011167 method public void setAuxEffectSendLevel(float);
@@ -11172,6 +11179,7 @@ package android.media {
1117211179 method public void setOnInfoListener(android.media.MediaPlayer.OnInfoListener);
1117311180 method public void setOnPreparedListener(android.media.MediaPlayer.OnPreparedListener);
1117411181 method public void setOnSeekCompleteListener(android.media.MediaPlayer.OnSeekCompleteListener);
11182+ method public void setOnTimedTextListener(android.media.MediaPlayer.OnTimedTextListener);
1117511183 method public void setOnVideoSizeChangedListener(android.media.MediaPlayer.OnVideoSizeChangedListener);
1117611184 method public void setScreenOnWhilePlaying(boolean);
1117711185 method public void setSurface(android.view.Surface);
@@ -11189,6 +11197,7 @@ package android.media {
1118911197 field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321
1119011198 field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1
1119111199 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc
11200+ field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip";
1119211201 }
1119311202
1119411203 public static abstract interface MediaPlayer.OnBufferingUpdateListener {
@@ -11215,10 +11224,25 @@ package android.media {
1121511224 method public abstract void onSeekComplete(android.media.MediaPlayer);
1121611225 }
1121711226
11227+ public static abstract interface MediaPlayer.OnTimedTextListener {
11228+ method public abstract void onTimedText(android.media.MediaPlayer, android.media.TimedText);
11229+ }
11230+
1121811231 public static abstract interface MediaPlayer.OnVideoSizeChangedListener {
1121911232 method public abstract void onVideoSizeChanged(android.media.MediaPlayer, int, int);
1122011233 }
1122111234
11235+ public static class MediaPlayer.TrackInfo implements android.os.Parcelable {
11236+ method public int describeContents();
11237+ method public java.lang.String getLanguage();
11238+ method public int getTrackType();
11239+ method public void writeToParcel(android.os.Parcel, int);
11240+ field public static final int MEDIA_TRACK_TYPE_AUDIO = 2; // 0x2
11241+ field public static final int MEDIA_TRACK_TYPE_TIMEDTEXT = 3; // 0x3
11242+ field public static final int MEDIA_TRACK_TYPE_UNKNOWN = 0; // 0x0
11243+ field public static final int MEDIA_TRACK_TYPE_VIDEO = 1; // 0x1
11244+ }
11245+
1122211246 public class MediaRecorder {
1122311247 ctor public MediaRecorder();
1122411248 method public static final int getAudioSourceMax();
@@ -11450,6 +11474,11 @@ package android.media {
1145011474 field public static final int OPTIONS_RECYCLE_INPUT = 2; // 0x2
1145111475 }
1145211476
11477+ public final class TimedText {
11478+ method public android.graphics.Rect getBounds();
11479+ method public java.lang.String getText();
11480+ }
11481+
1145311482 public class ToneGenerator {
1145411483 ctor public ToneGenerator(int, int);
1145511484 method public final int getAudioSessionId();
0 commit comments