am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom

* commit '5d87227bad8126d701145cd07c3ac2a365e8480e': Clear callbacks in camera stopPreview.
2011-09-23 08:33:46 -07:00
parent c56c92013c 5d87227bad
commit 4cd34752cb
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();