diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-26 17:35:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-26 17:35:55 -0700 |
| commit | 69a9d64ccdcdb7c6d0441942439e68eedd76cb51 (patch) | |
| tree | 48a766824505f7e0baf0e5207599eb3b3ad4d44f /src/com/android/camera/CaptureModule.java | |
| parent | cae0bd90bbbf972c35bc5612537aed9964c37358 (diff) | |
| parent | fece21321499f4ff95d4141f268f10acce2ae23a (diff) | |
Merge changes I03f9dda1,I6cf67330 into camera.lnx.1.0-dev.1.0
* changes:
SnapdragonCamera: Fix cropping issues with CS output
SnapdragonCamera: Ensure smooth quit during cs processing
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 9ad45fefc..0b41701ea 100644 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3532,8 +3532,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() { @@ -3541,14 +3549,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() { |