commit faf0e89ce3bdb2c50eb5da671bc4fc2a618ebf89
author ztenghui <ztenghui@google.com> Fri Mar 15 18:41:33 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 15 18:41:34 2013 +0000
tree 560f31a623f65651818a8a8a4edbc141a7b536e6
parent c60967fd83e7a736f311a1887543df430a65164c
parent a83df76859f0af12105bcea27e2e8d9f0b4d2c31

Merge "Make release() behaves the same way as other part of media framework" into jb-mr2-dev

media/java/android/media/MediaMuxer.java

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 @@
      */
     public void release() {
         if (mState == MUXER_STATE_STARTED) {
-            throw new IllegalStateException("Can't release when muxer is started");
+            stop();
         }
         if (mNativeObject != 0) {
             nativeRelease(mNativeObject);