diff options
| author | Doris Liu <tianliu@google.com> | 2014-04-30 21:23:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 21:23:48 +0000 |
| commit | 8dfa3c7d5d676590e4f4f200805fe711b88fef8c (patch) | |
| tree | 508af2b5eac53c1cd186abc0224d1d685d2a0718 /src/com/android/camera/VideoModule.java | |
| parent | 48a380627793dfc11070505d5493bd8eb948969e (diff) | |
| parent | efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f (diff) | |
| download | android_packages_apps_Camera2-8dfa3c7d5d676590e4f4f200805fe711b88fef8c.tar.gz android_packages_apps_Camera2-8dfa3c7d5d676590e4f4f200805fe711b88fef8c.tar.bz2 android_packages_apps_Camera2-8dfa3c7d5d676590e4f4f200805fe711b88fef8c.zip | |
am efcc8f0c: Merge "Log warning when video snapshot is requested on devices not supporting it" into gb-ub-photos-denali
* commit 'efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f':
Log warning when video snapshot is requested on devices not supporting it
Diffstat (limited to 'src/com/android/camera/VideoModule.java')
| -rw-r--r-- | src/com/android/camera/VideoModule.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 498129ae5..7d73246fe 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -393,7 +393,11 @@ public class VideoModule extends CameraModule private void takeASnapshot() { // Only take snapshots if video snapshot is supported by device - if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) { + if(!mParameters.isVideoSnapshotSupported()) { + Log.w(TAG, "Cannot take a video snapshot - not supported by hardware"); + return; + } + if (!mIsVideoCaptureIntent) { if (!mMediaRecorderRecording || mPaused || mSnapshotInProgress || !mAppController.isShutterEnabled()) { return; |