Merge "SoundRecorder crash if click start/stop button quickly" am: 244b758346 am: f1cfef4ea0

am: 9e3048285a

Change-Id: I8e03e4a1a6cb38af077c21791d6d935a69bff30a

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/android/soundrecorder/Recorder.java b/src/com/android/soundrecorder/Recorder.java
index b9654cd..9d906c2 100644
--- a/src/com/android/soundrecorder/Recorder.java
+++ b/src/com/android/soundrecorder/Recorder.java
@@ -200,7 +200,12 @@ public class Recorder implements OnCompletionListener, OnErrorListener {
         if (mRecorder == null)
             return;
 
-        mRecorder.stop();
+        try {
+            mRecorder.stop();
+        } catch (RuntimeException e) {
+            Log.w("Recorder", "Catch RuntimeException on MediaRecorder.stop() due to a call " +
+                "immediately after MediaRecorder.start().");
+        }
         mRecorder.release();
         mRecorder = null;