commit fb71fba09059cc3399d563f16a5c9fafe95c75ec
author Pannag Sanketi <psanketi@google.com> Wed Oct 12 14:43:56 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 12 14:43:56 2011 -0700
tree f2b0b869eb88d8c22ce3fb79990a12fd5cd2172d
parent bff700befa4fd4735d242fe615bec8daa864fc96
parent bb6fcb0f4d2a694b0d9af472d7444c653592a99e

am bb6fcb0f: Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0

* commit 'bb6fcb0f4d2a694b0d9af472d7444c653592a99e':
  Handle MediaRecorder stop exception for effects recording

src/com/android/camera/VideoCamera.java

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
old mode 100755
new mode 100644
index 77e163e..5fddcf7
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -76,6 +76,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import android.filterpacks.videosink.MediaRecorderStopException;
+
 /**
  * The Camcorder activity.
  */
@@ -1948,6 +1950,10 @@
         if (fileName != null && new File(fileName).exists()) {
             deleteVideoFile(fileName);
         }
+        if (exception instanceof MediaRecorderStopException) {
+            Log.w(TAG, "Problem recoding video file. Removing incomplete file.");
+            return;
+        }
         throw new RuntimeException("Error during recording!", exception);
     }