From a514b14dd769f67478c3296451bd9cd05676fa5f Mon Sep 17 00:00:00 2001 From: Sascha Haeberling Date: Tue, 13 Aug 2013 16:10:01 -0700 Subject: Don't take a snapshot if video recording is not in progress. Bug:10312841 Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f --- src/com/android/camera/VideoModule.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/com/android/camera/VideoModule.java') diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index ada0a606f..76e1c5a31 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -418,15 +418,17 @@ public class VideoModule implements CameraModule, mOrientation).show(); return; } - takeASnapshot(); } private void takeASnapshot() { - // only take snapshots if video snapshot is supported by device + // Only take snapshots if video snapshot is supported by device if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) { + if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress || effectsActive()) { + return; + } MediaSaveService s = mActivity.getMediaSaveService(); - if (mPaused || mSnapshotInProgress || effectsActive() || s == null || s.isQueueFull()) { + if (s == null || s.isQueueFull()) { return; } -- cgit v1.2.3