diff options
| author | Ivan Evlogiev <ivanevlogiev@codeaurora.org> | 2014-06-20 16:18:26 +0300 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-20 06:43:47 -0700 |
| commit | ff5dd9a4cea70102c35471b1bc7a9ff34c0b16f7 (patch) | |
| tree | b9ed6633667ea658d7288395c48c556a2b0e9565 | |
| parent | cfe9d2fa84f969a5e70bf82f8df45a9f252b8f98 (diff) | |
| download | android_packages_apps_Snap-ff5dd9a4cea70102c35471b1bc7a9ff34c0b16f7.tar.gz android_packages_apps_Snap-ff5dd9a4cea70102c35471b1bc7a9ff34c0b16f7.tar.bz2 android_packages_apps_Snap-ff5dd9a4cea70102c35471b1bc7a9ff34c0b16f7.zip | |
Camera2: Fix callback with old data after camera switch
- Fix race condition for calling camera callbacks
with old data after camera switch
Change-Id: If63e7903f3e7821220397b1b8cea4d9478ba3c94
| -rw-r--r-- | src/com/android/camera/AndroidCameraManagerImpl.java | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 75f127a68..637a5f5c5 100644 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -633,10 +633,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onAutoFocus(final boolean b, Camera camera) { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onAutoFocus(b, mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onAutoFocus(b, mCamera); + } } }); } @@ -674,10 +678,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onAutoFocusMoving( final boolean moving, android.hardware.Camera camera) { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onAutoFocusMoving(moving, mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onAutoFocusMoving(moving, mCamera); + } } }); } @@ -715,10 +723,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onShutter() { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onShutter(mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onShutter(mCamera); + } } }); } @@ -757,10 +769,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onPictureTaken( final byte[] data, android.hardware.Camera camera) { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onPictureTaken(data, mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onPictureTaken(data, mCamera); + } } }); } @@ -799,10 +815,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onPreviewFrame( final byte[] data, android.hardware.Camera camera) { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onPreviewFrame(data, mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onPreviewFrame(data, mCamera); + } } }); } @@ -838,10 +858,14 @@ class AndroidCameraManagerImpl implements CameraManager { @Override public void onFaceDetection( final Camera.Face[] faces, Camera camera) { + final android.hardware.Camera currentCamera = mCamera.getCamera(); + mHandler.post(new Runnable() { @Override public void run() { - mCallback.onFaceDetection(faces, mCamera); + if (currentCamera.equals(mCamera.getCamera())) { + mCallback.onFaceDetection(faces, mCamera); + } } }); } |