commit 39f1c22bbe02a5d8edaa1e0ba60e49ed27215e4b
author Alan Newberger <alann@google.com> Wed Apr 30 23:16:36 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 30 23:16:37 2014 +0000
tree 750a83bb05d6e5077c593092617e70d38692276d
parent efcc8f0c67340ce2ad7d1477cbb7d33e6b7ea73f
parent e95aefe4461e8e3192e227d98076b75975ed3ec5

Merge "Fix storage warning hint crash" into gb-ub-photos-denali

src/com/android/camera/VideoModule.java

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 70cc12e..4b657bb 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -392,7 +392,11 @@
 
     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;