diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-03 22:51:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-03 22:51:32 +0000 |
| commit | a861245f06e854d47ff44155ebd3ac0e31c0cb2c (patch) | |
| tree | 6c8ab56bbef142c6f7ee54d23cfc5fd0dbaf1df3 /api | |
| parent | 02a25a97a24e06768159ddc2b680c253a2ce71c7 (diff) | |
| parent | af309824350d6b2fd38e19ef9104211e5ba132e8 (diff) | |
| download | frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.zip frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.tar.gz frameworks_base-a861245f06e854d47ff44155ebd3ac0e31c0cb2c.tar.bz2 | |
Merge "VideoView: add addSubtitleSource" into klp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 458c577..4c18909 100644 --- a/api/current.txt +++ b/api/current.txt @@ -12892,7 +12892,9 @@ package android.media { field public static final int MEDIA_INFO_BUFFERING_START = 701; // 0x2bd field public static final int MEDIA_INFO_METADATA_UPDATE = 802; // 0x322 field public static final int MEDIA_INFO_NOT_SEEKABLE = 801; // 0x321 + field public static final int MEDIA_INFO_SUBTITLE_TIMED_OUT = 902; // 0x386 field public static final int MEDIA_INFO_UNKNOWN = 1; // 0x1 + field public static final int MEDIA_INFO_UNSUPPORTED_SUBTITLE = 901; // 0x385 field public static final int MEDIA_INFO_VIDEO_RENDERING_START = 3; // 0x3 field public static final int MEDIA_INFO_VIDEO_TRACK_LAGGING = 700; // 0x2bc field public static final java.lang.String MEDIA_MIMETYPE_TEXT_SUBRIP = "application/x-subrip"; @@ -32659,6 +32661,7 @@ package android.widget { ctor public VideoView(android.content.Context); ctor public VideoView(android.content.Context, android.util.AttributeSet); ctor public VideoView(android.content.Context, android.util.AttributeSet, int); + method public void addSubtitleSource(java.io.InputStream, android.media.MediaFormat); method public boolean canPause(); method public boolean canSeekBackward(); method public boolean canSeekForward(); |