Merge "SnapdragonCamera:Fix recording state"

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 76a524239..34686e58f 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -3923,6 +3923,7 @@ public class CaptureModule implements CameraModule, PhotoController,
         }
         Log.d(TAG, "StartRecordingVideo " + cameraId);
         mStartRecPending = true;
+        mIsRecordingVideo = true;
         mMediaRecorderPausing = false;
 
         checkAndPlayRecordSound(cameraId, true);
@@ -4076,6 +4077,7 @@ public class CaptureModule implements CameraModule, PhotoController,
             e.printStackTrace();
             quitRecordingWithError("NullPointException");
         }
+        mStartRecPending = false;
         return true;
     }
 
@@ -4107,9 +4109,6 @@ public class CaptureModule implements CameraModule, PhotoController,
         requestAudioFocus();
         try {
             mMediaRecorder.start(); // Recording is now started
-            mIsRecordingVideo = true;
-            mStartRecPending = false;
-            Log.d(TAG, "StartRecordingVideo done.");
         } catch (RuntimeException e) {
             Toast.makeText(mActivity,"Could not start media recorder.\n " +
                     "Can't start video recording.", Toast.LENGTH_LONG).show();