diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-05-30 19:07:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-30 19:07:55 -0700 |
| commit | 28795d883a34f5393ff00dca0a54aca79b2607d5 (patch) | |
| tree | 1285e85804a55b712d13c3c6d7160fcccd8ffdef /core | |
| parent | 758534ed50d1d2c643999bd7eb3f909b0834e393 (diff) | |
| parent | ca367b717806c4c69190641c3361d3520a44ad08 (diff) | |
| download | frameworks_base-28795d883a34f5393ff00dca0a54aca79b2607d5.zip frameworks_base-28795d883a34f5393ff00dca0a54aca79b2607d5.tar.gz frameworks_base-28795d883a34f5393ff00dca0a54aca79b2607d5.tar.bz2 | |
Merge "Fix race condition with preview callback." into jb-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 035a7c6..4d9077f 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -736,8 +736,8 @@ public class Camera { return; case CAMERA_MSG_PREVIEW_FRAME: - if (mPreviewCallback != null) { - PreviewCallback cb = mPreviewCallback; + PreviewCallback pCb = mPreviewCallback; + if (pCb != null) { if (mOneShot) { // Clear the callback variable before the callback // in case the app calls setPreviewCallback from @@ -749,7 +749,7 @@ public class Camera { // Set to oneshot mode again. setHasPreviewCallback(true, false); } - cb.onPreviewFrame((byte[])msg.obj, mCamera); + pCb.onPreviewFrame((byte[])msg.obj, mCamera); } return; |