2 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 970d98e..982f235 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1492,6 +1492,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
             CameraHolder.instance().release();
             mCameraDevice.setZoomChangeListener(null);
             mCameraDevice.setFaceDetectionListener(null);
+            mCameraDevice.setErrorCallback(null);
             mCameraDevice = null;
             mCameraState = PREVIEW_STOPPED;
             mFocusManager.onCameraReleased();
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 070363b..3e2b38d 100644
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -915,6 +915,8 @@ public class VideoCamera extends ActivityBase
         }
         mEffectType = EffectsRecorder.EFFECT_NONE;
         CameraHolder.instance().release();
+        mCameraDevice.setZoomChangeListener(null);
+        mCameraDevice.setErrorCallback(null);
         mCameraDevice = null;
         mPreviewing = false;
         mSnapshotInProgress = false;
@@ -2115,7 +2117,7 @@ public class VideoCamera extends ActivityBase
         mZoomControl.setZoomMax(mZoomMax);
         mZoomControl.setZoomIndex(mParameters.getZoom());
         mZoomControl.setSmoothZoomSupported(mSmoothZoomSupported);
-        mZoomControl.setOnZoomChangeListener(new ZoomChangeListener()   );
+        mZoomControl.setOnZoomChangeListener(new ZoomChangeListener());
         mCameraDevice.setZoomChangeListener(mZoomListener);
     }