commit 91561bdb6ab42d5a262201fb4044bdc5949ca07c
author Wu-cheng Li <wuchengli@google.com> Fri Sep 03 15:10:44 2010 -0700
committer Wu-cheng Li <wuchengli@google.com> Fri Sep 03 15:10:44 2010 -0700
tree 30d4db0043fcdff4340938869123f4c4da1f450f
parent 3c7f489d9ea86e6f37b596469173cd3ceca3ad58

Fix the crash when video quality changes.

Stop the preview in surfaceChanged before restarting the preview.

bug:2974865
Change-Id: Ie6b99c2650ee4900a277da87006950e984358d6f

src/com/android/camera/VideoCamera.java

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 1d19561..cb0bb02 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -639,6 +639,10 @@
         }
 
         mCameraDevice.lock();
+        if (mPreviewing == true) {
+            mCameraDevice.stopPreview();
+            mPreviewing = false;
+        }
         setPreviewDisplay(mSurfaceHolder);
         Util.setCameraDisplayOrientation(this, mCameraId, mCameraDevice);
         setCameraParameters();
@@ -805,6 +809,10 @@
             mHandler.sendEmptyMessage(INIT_RECORDER);
         } else {
             stopVideoRecording();
+            // If video quality changes, the surface will change. But we need to
+            // initialize the recorder here. So collpase the head-up display to
+            // keep the state of recorder consistent.
+            mHeadUpDisplay.collapse();
             restartPreview();
             initializeRecorder();
         }