summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2013-11-07 01:58:52 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-07 01:58:52 +0000
commit928f9fe466942e57dc01c6df0f528a59e621d8df (patch)
tree77ff4490315d655004dd4f12ea84275a1a097c3d /api
parent4220ed7ed7efd346252f1baec3360a5e34c21951 (diff)
parent52d8aa79a31c5042d2b43d06f08fa28489b27d1b (diff)
downloadframeworks_base-928f9fe466942e57dc01c6df0f528a59e621d8df.zip
frameworks_base-928f9fe466942e57dc01c6df0f528a59e621d8df.tar.gz
frameworks_base-928f9fe466942e57dc01c6df0f528a59e621d8df.tar.bz2
Merge "Add "throws IOException" to MediaCodec constructors (3)"
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 8ec81b7..0207448 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12597,9 +12597,9 @@ package android.media {
public final class MediaCodec {
method public void configure(android.media.MediaFormat, android.view.Surface, android.media.MediaCrypto, int);
- method public static android.media.MediaCodec createByCodecName(java.lang.String);
- method public static android.media.MediaCodec createDecoderByType(java.lang.String);
- method public static android.media.MediaCodec createEncoderByType(java.lang.String);
+ method public static android.media.MediaCodec createByCodecName(java.lang.String) throws java.io.IOException;
+ method public static android.media.MediaCodec createDecoderByType(java.lang.String) throws java.io.IOException;
+ method public static android.media.MediaCodec createEncoderByType(java.lang.String) throws java.io.IOException;
method public final android.view.Surface createInputSurface();
method public final int dequeueInputBuffer(long);
method public final int dequeueOutputBuffer(android.media.MediaCodec.BufferInfo, long);