diff options
| author | ztenghui <ztenghui@google.com> | 2013-03-15 18:41:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-15 18:41:34 +0000 |
| commit | faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89 (patch) | |
| tree | 560f31a623f65651818a8a8a4edbc141a7b536e6 | |
| parent | c60967fd83e7a736f311a1887543df430a65164c (diff) | |
| parent | a83df76859f0af12105bcea27e2e8d9f0b4d2c31 (diff) | |
| download | frameworks_base-faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89.zip frameworks_base-faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89.tar.gz frameworks_base-faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89.tar.bz2 | |
Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev
| -rw-r--r-- | media/java/android/media/MediaMuxer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/java/android/media/MediaMuxer.java b/media/java/android/media/MediaMuxer.java index dfd0e94..c3cc1e6 100644 --- a/media/java/android/media/MediaMuxer.java +++ b/media/java/android/media/MediaMuxer.java @@ -276,7 +276,7 @@ final public class MediaMuxer { */ public void release() { if (mState == MUXER_STATE_STARTED) { - throw new IllegalStateException("Can't release when muxer is started"); + stop(); } if (mNativeObject != 0) { nativeRelease(mNativeObject); |