Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac8ed11d authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

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

* commit '28795d88':
  Fix race condition with preview callback.
parents 191e7c5a 28795d88

core/java/android/hardware/Camera.java

+3 −3
Original line number Diff line number Diff line
@@ -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;