Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ac8ed11d: am 28795d88: Merge "Fix race condition with preview callback." into jb-dev

Browse Source 
* commit 'ac8ed11db3ccfa4f017bbb20d49c463595e6d90a':
  Fix race condition with preview callback.
This commit is contained in:
Eino-Ville Talvala
2012-05-30 19:17:28 -07:00
committed by Android Git Automerger
parent 2d9f96bf45 ac8ed11db3
commit 80ee5aaeea
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/Camera.java
View File

@@ -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;