From 2edb34a53f8006cf2030956861b05e8e67673fdb Mon Sep 17 00:00:00 2001 From: Jay Wang Date: Wed, 24 Aug 2016 17:53:16 -0700 Subject: SnapdragonCamera: Ensure smooth quit during cs processing Ensure a smooth quit transition during Clearsight processing. Move image reader/writer disposal to after handler quit. Don't toast Clearsight success/fail until after all tasks are complete. CRs-Fixed: 1058833 Change-Id: I6cf6733051d1947ea65a003b9bacb9d575c6ef67 --- src/com/android/camera/CaptureModule.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/com/android/camera/CaptureModule.java') diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index a8df9feb1..da4f131c5 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3430,8 +3430,16 @@ public class CaptureModule implements CameraModule, PhotoController, } @Override - public void onClearSightSuccess() { + public void onReleaseShutterLock() { + Log.d(TAG, "onReleaseShutterLock"); + unlockFocus(BAYER_ID); + unlockFocus(MONO_ID); + } + + @Override + public void onClearSightSuccess(byte[] thumbnailBytes) { Log.d(TAG, "onClearSightSuccess"); + if(thumbnailBytes != null) mActivity.updateThumbnail(thumbnailBytes); mActivity.runOnUiThread(new Runnable() { @Override public void run() { @@ -3439,14 +3447,12 @@ public class CaptureModule implements CameraModule, PhotoController, Toast.LENGTH_SHORT).show(); } }); - - unlockFocus(BAYER_ID); - unlockFocus(MONO_ID); } @Override - public void onClearSightFailure() { + public void onClearSightFailure(byte[] thumbnailBytes) { Log.d(TAG, "onClearSightFailure"); + if(thumbnailBytes != null) mActivity.updateThumbnail(thumbnailBytes); mActivity.runOnUiThread(new Runnable() { @Override public void run() { -- cgit v1.2.3