diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-01-04 16:14:44 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-01-04 16:14:44 -0800 |
| commit | 83e0960e5064818e6f88662e71d2e5d866204d7a (patch) | |
| tree | 0f07d9e73b7d8b9f92acdf8c77a8f03b5be41831 /src | |
| parent | 5cef6b0eac4324256f404099e7365e65ac94558a (diff) | |
| parent | 1fb423130dbecb74a1cee280337ea7334e5ec952 (diff) | |
| download | android_packages_apps_Snap-83e0960e5064818e6f88662e71d2e5d866204d7a.tar.gz android_packages_apps_Snap-83e0960e5064818e6f88662e71d2e5d866204d7a.tar.bz2 android_packages_apps_Snap-83e0960e5064818e6f88662e71d2e5d866204d7a.zip | |
Merge "It recording failed, then remove video file first" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 7c524841a..5864a9193 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -7211,8 +7211,8 @@ public class CaptureModule implements CameraModule, PhotoController, private void releaseMediaRecorder() { Log.v(TAG, "Releasing media recorder."); + cleanupEmptyFile(); if (mMediaRecorder != null) { - cleanupEmptyFile(); try{ mMediaRecorder.reset(); mMediaRecorder.release(); @@ -7221,7 +7221,6 @@ public class CaptureModule implements CameraModule, PhotoController, } mMediaRecorder = null; } - mVideoFilename = null; } private void cleanupEmptyFile() { |