Don't record video before preview is started

  Bug: 8358998

Change-Id: I5d2380020b3e999f904b8a715324db13b25ebb5a

diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 7bda657..a7a5335 100644 (file)
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -810,7 +810,9 @@ public class VideoModule implements CameraModule,
     public void onResumeAfterSuper() {
         if (mActivity.mOpenCameraFail || mActivity.mCameraDisabled)
             return;
-
+        if (mShutterButton != null) {
+            mShutterButton.setEnabled(false);
+        }
         mZoomValue = 0;
 
         showVideoSnapshotUI(false);
@@ -884,7 +886,6 @@ public class VideoModule implements CameraModule,
             }
         }
 
-        mPreviewing = true;
 
         setDisplayOrientation();
         mActivity.mCameraDevice.setDisplayOrientation(mCameraDisplayOrientation);
@@ -903,9 +904,13 @@ public class VideoModule implements CameraModule,
                     mActivity.mCameraDevice.setPreviewDisplayAsync(mPreviewSurfaceView.getHolder());
                 }
                 mActivity.mCameraDevice.startPreviewAsync();
+                mPreviewing = true;
+                onPreviewStarted();
             } else {
                 initializeEffectsPreview();
                 mEffectsRecorder.startPreview();
+                mPreviewing = true;
+                onPreviewStarted();
             }
         } catch (Throwable ex) {
             closeCamera();
@@ -922,6 +927,13 @@ public class VideoModule implements CameraModule,
                 }
             });
         }
+
+    }
+
+    private void onPreviewStarted() {
+        if (mShutterButton != null) {
+            mShutterButton.setEnabled(true);
+        }
     }
 
     private void stopPreview() {