diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-07-03 21:10:57 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-07-03 21:10:57 -0700 |
| commit | c4c5eabb4ab0a0898f2f4fb46554452a0c0e83d4 (patch) | |
| tree | ae56d4cb648f1dcc774e9a4ed4c228b7b83edba6 | |
| parent | 4138cf070c6c748fff65bb1d7dbe8fd67a417fa9 (diff) | |
| parent | ff5dd9a4cea70102c35471b1bc7a9ff34c0b16f7 (diff) | |
| download | android_packages_apps_Snap-c4c5eabb4ab0a0898f2f4fb46554452a0c0e83d4.tar.gz android_packages_apps_Snap-c4c5eabb4ab0a0898f2f4fb46554452a0c0e83d4.tar.bz2 android_packages_apps_Snap-c4c5eabb4ab0a0898f2f4fb46554452a0c0e83d4.zip | |
Merge "Camera2: Fix callback with old data after camera switch"
| -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); + } } }); } |