diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-08-13 16:10:01 -0700 |
---|---|---|
committer | Sascha Haeberling <haeberling@google.com> | 2013-08-13 16:10:01 -0700 |
commit | a514b14dd769f67478c3296451bd9cd05676fa5f (patch) | |
tree | 71540ea49d0810b0a7e1af1b849231d9fbd67f46 /src/com/android/camera/VideoModule.java | |
parent | ddef7798808fb8871650a5a803aec1f169a08bcb (diff) | |
download | android_packages_apps_Snap-a514b14dd769f67478c3296451bd9cd05676fa5f.tar.gz android_packages_apps_Snap-a514b14dd769f67478c3296451bd9cd05676fa5f.tar.bz2 android_packages_apps_Snap-a514b14dd769f67478c3296451bd9cd05676fa5f.zip |
Don't take a snapshot if video recording is not in progress.
Bug:10312841
Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
-rw-r--r-- | src/com/android/camera/VideoModule.java | 8 |
1 files changed, 5 insertions, 3 deletions
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; } |