diff options
| author | Wei Huang <weih@google.com> | 2011-09-23 08:33:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 08:33:46 -0700 |
| commit | 4cd34752cb229f3e1716e1e92f54f58dd847745c (patch) | |
| tree | 3102fce84da50c28a159000716e4426021a3a25e /core | |
| parent | c56c92013c0acfa4517ed5d36d8aa78bc21452ae (diff) | |
| parent | 5d87227bad8126d701145cd07c3ac2a365e8480e (diff) | |
| download | frameworks_base-4cd34752cb229f3e1716e1e92f54f58dd847745c.zip frameworks_base-4cd34752cb229f3e1716e1e92f54f58dd847745c.tar.gz frameworks_base-4cd34752cb229f3e1716e1e92f54f58dd847745c.tar.bz2 | |
am 5d87227b: Merge "Clear callbacks in camera stopPreview." into ics-factoryrom
* commit '5d87227bad8126d701145cd07c3ac2a365e8480e':
Clear callbacks in camera stopPreview.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 58f7869..5951195 100644 --- 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(); |