diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-05-30 19:12:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-30 19:12:52 -0700 |
| commit | ac8ed11db3ccfa4f017bbb20d49c463595e6d90a (patch) | |
| tree | e098ce6cea29b28a413b70f4a693f1778666f847 /core/java/android | |
| parent | 191e7c5a4959e4c16154ade5d1ceb277ef31021e (diff) | |
| parent | 28795d883a34f5393ff00dca0a54aca79b2607d5 (diff) | |
| download | frameworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.zip frameworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.tar.gz frameworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.tar.bz2 | |
am 28795d88: Merge "Fix race condition with preview callback." into jb-dev
* commit '28795d883a34f5393ff00dca0a54aca79b2607d5':
Fix race condition with preview callback.
Diffstat (limited to 'core/java/android')
| -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; |