Merge "Clear callbacks in camera stopPreview." into ics-factoryrom

2011-09-23 08:30:32 -07:00
parent a780fb8e22 664d72e663
commit 5d87227bad
1 changed files with 6 additions and 0 deletions
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -480,6 +480,12 @@ public class Camera {
    public final void stopPreview() {
        _stopPreview();
        mFaceDetectionRunning = false;
+
+        mShutterCallback = null;
+        mRawImageCallback = null;
+        mPostviewCallback = null;
+        mJpegCallback = null;
+        mAutoFocusCallback = null;
    }

    private native final void _stopPreview();