aboutsummaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTimothy Knight <tknight@google.com>2014-09-20 22:52:32 -0700
committerTimothy Knight <tknight@google.com>2014-09-20 22:52:32 -0700
commit5fb49b512e78e58d3b8f7c95db358790fdc6dfd7 (patch)
tree25f168e6bb29b72762e8b0b3f51c9825e1067ff2 /apps
parent380d750ece0a9899a04aa8ea990c4a88f2055d9f (diff)
downloadpdk-5fb49b512e78e58d3b8f7c95db358790fdc6dfd7.tar.gz
CameraITS: Force AF trigger in do_3a (if do_af is true)
Change-Id: I33992d970b0758954627fd1fc74e96f0fb89b557
Diffstat (limited to 'apps')
-rw-r--r--apps/CameraITS/service/src/com/android/camera2/its/ItsService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java
index 9c196ca..7750464 100644
--- a/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java
+++ b/apps/CameraITS/service/src/com/android/camera2/its/ItsService.java
@@ -773,7 +773,8 @@ public class ItsService extends Service implements SensorEventListener {
mInterlock3A.close();
// If not converged yet, issue another capture request.
- if ((doAE && !mConvergedAE) || !mConvergedAWB || (doAF && !mConvergedAF)) {
+ if ((doAE && (!triggeredAE || !mConvergedAE)) || !mConvergedAWB ||
+ (doAF && (!triggeredAF || !mConvergedAF))) {
// Baseline capture request for 3A.
CaptureRequest.Builder req = mCamera.createCaptureRequest(