1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 94c86250..ea50033f 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1123,6 +1123,7 @@ public class VideoModule implements CameraModule,
         setupMediaRecorderPreviewDisplay();
         // Unlock the camera object before passing it to media recorder.
         mActivity.mCameraDevice.unlock();
+        mActivity.mCameraDevice.waitDone();
         mMediaRecorder.setCamera(mActivity.mCameraDevice.getCamera());
         if (!mCaptureTimeLapse) {
             mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.CAMCORDER);
@@ -1647,6 +1648,7 @@ public class VideoModule implements CameraModule,
             releaseMediaRecorder();
             if (!mPaused) {
                 mActivity.mCameraDevice.lock();
+                mActivity.mCameraDevice.waitDone();
                 if (ApiHelper.HAS_SURFACE_TEXTURE &&
                     !ApiHelper.HAS_SURFACE_TEXTURE_RECORDING) {
                     stopPreview();