diff options
| author | Pannag Sanketi <psanketi@google.com> | 2011-10-12 14:42:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-12 14:42:14 -0700 |
| commit | bb6fcb0f4d2a694b0d9af472d7444c653592a99e (patch) | |
| tree | 0e02faa4fa27c8bc0d775e02267fee93ea6f7f8f /src/com/android | |
| parent | 23c2671f5d9913766bc68d4eb6483c87680f8caf (diff) | |
| parent | c2151f208379162fc1572b3125d3972ec8a8b1f2 (diff) | |
| download | packages_apps_LegacyCamera-bb6fcb0f4d2a694b0d9af472d7444c653592a99e.zip packages_apps_LegacyCamera-bb6fcb0f4d2a694b0d9af472d7444c653592a99e.tar.gz packages_apps_LegacyCamera-bb6fcb0f4d2a694b0d9af472d7444c653592a99e.tar.bz2 | |
Merge "Handle MediaRecorder stop exception for effects recording" into ics-mr0
Diffstat (limited to 'src/com/android')
| -rw-r--r--[-rwxr-xr-x] | src/com/android/camera/VideoCamera.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 77e163e..5fddcf7 100755..100644 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -76,6 +76,8 @@ import java.util.Date; import java.util.Iterator; import java.util.List; +import android.filterpacks.videosink.MediaRecorderStopException; + /** * The Camcorder activity. */ @@ -1948,6 +1950,10 @@ public class VideoCamera extends ActivityBase 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); } |