summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2013-11-07 04:15:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-07 04:15:32 +0000
commitb84a72cb5ca1acb816cfef6ea1211dde6bb43439 (patch)
treea912e6c506273de0834a065344c6d4d5d856ebd9 /api
parentf994e7915d46c90bb47b97bfc2dd3db90a80c73b (diff)
parent8ca55fc980a567270d397c7392fd5fa8490f6d42 (diff)
downloadframeworks_base-b84a72cb5ca1acb816cfef6ea1211dde6bb43439.zip
frameworks_base-b84a72cb5ca1acb816cfef6ea1211dde6bb43439.tar.gz
frameworks_base-b84a72cb5ca1acb816cfef6ea1211dde6bb43439.tar.bz2
Merge "Revert "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 0207448..8ec81b7 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) 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 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 final android.view.Surface createInputSurface();
method public final int dequeueInputBuffer(long);
method public final int dequeueOutputBuffer(android.media.MediaCodec.BufferInfo, long);