Delete the video file if MediaRecorder.stop() throws an exception.

The file may be malformed and causes problems in decoding.
bug:2934606

Change-Id: I2864584c934455a5aa01f8fc6d732494dd7c2899

1 files changed, 5 insertions, 4 deletions

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index d617e4c..fb4e44a 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -1304,14 +1304,15 @@ public class VideoCamera extends NoSearchActivity
                     mMediaRecorder.setOnErrorListener(null);
                     mMediaRecorder.setOnInfoListener(null);
                     mMediaRecorder.stop();
+                    mCurrentVideoFilename = mVideoFilename;
+                    Log.v(TAG, "Setting current video filename: "
+                            + mCurrentVideoFilename);
+                    needToRegisterRecording = true;
                 } catch (RuntimeException e) {
                     Log.e(TAG, "stop fail: " + e.getMessage());
+                    deleteVideoFile(mVideoFilename);
                 }
                 mHeadUpDisplay.setEnabled(true);
-                mCurrentVideoFilename = mVideoFilename;
-                Log.v(TAG, "Setting current video filename: "
-                        + mCurrentVideoFilename);
-                needToRegisterRecording = true;
                 mMediaRecorderRecording = false;
             }
             releaseMediaRecorder();