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

1 files changed, 11 insertions, 5 deletions

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() {