summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorztenghui <ztenghui@google.com>2013-03-14 16:02:39 -0700
committerztenghui <ztenghui@google.com>2013-03-14 16:02:45 -0700
commita83df76859f0af12105bcea27e2e8d9f0b4d2c31 (patch)
tree61a181c8f1b8a9ee2fde6e4a5c9dfbe104cbecb0
parent68ccf103a10c674f1db649bb15bb3e790bc6dad3 (diff)
downloadframeworks_base-a83df76859f0af12105bcea27e2e8d9f0b4d2c31.zip
frameworks_base-a83df76859f0af12105bcea27e2e8d9f0b4d2c31.tar.gz
frameworks_base-a83df76859f0af12105bcea27e2e8d9f0b4d2c31.tar.bz2
Make release() behaves the same way as other part of media framework
bug:7991013 Change-Id: Ib3efa94c0a6a599f71517f80fb7c3842d8d4e74f
-rw-r--r--media/java/android/media/MediaMuxer.java2
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);