Check for device support before taking video snapshots

Bug: 9496097
Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba

1 files changed, 24 insertions, 17 deletions

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index b28b66ffd..29fa79879 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -421,25 +421,32 @@ public class VideoModule implements CameraModule,
             return;
         }
 
-        MediaSaveService s = mActivity.getMediaSaveService();
-        if (mPaused || mSnapshotInProgress || effectsActive() || s == null || s.isQueueFull()) {
-            return;
-        }
+        takeASnapshot();
+    }
 
-        // Set rotation and gps data.
-        int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
-        mParameters.setRotation(rotation);
-        Location loc = mLocationManager.getCurrentLocation();
-        CameraUtil.setGpsParameters(mParameters, loc);
-        mCameraDevice.setParameters(mParameters);
+    private void takeASnapshot() {
+        // only take snapshots if video snapshot is supported by device
+        if (CameraUtil.isVideoSnapshotSupported(mParameters) && !mIsVideoCaptureIntent) {
+            MediaSaveService s = mActivity.getMediaSaveService();
+            if (mPaused || mSnapshotInProgress || effectsActive() || s == null || s.isQueueFull()) {
+                return;
+            }
 
-        Log.v(TAG, "Video snapshot start");
-        mCameraDevice.takePicture(mHandler,
-                null, null, null, new JpegPictureCallback(loc));
-        showVideoSnapshotUI(true);
-        mSnapshotInProgress = true;
-        UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
-                UsageStatistics.ACTION_CAPTURE_DONE, "VideoSnapshot");
+            // Set rotation and gps data.
+            int rotation = CameraUtil.getJpegRotation(mCameraId, mOrientation);
+            mParameters.setRotation(rotation);
+            Location loc = mLocationManager.getCurrentLocation();
+            CameraUtil.setGpsParameters(mParameters, loc);
+            mCameraDevice.setParameters(mParameters);
+
+            Log.v(TAG, "Video snapshot start");
+            mCameraDevice.takePicture(mHandler,
+                    null, null, null, new JpegPictureCallback(loc));
+            showVideoSnapshotUI(true);
+            mSnapshotInProgress = true;
+            UsageStatistics.onEvent(UsageStatistics.COMPONENT_CAMERA,
+                    UsageStatistics.ACTION_CAPTURE_DONE, "VideoSnapshot");
+        }
     }
 
     @Override