Fake ae precapture cancellation when requested
Limited devices are expected to have precapture ae enabled and
respond to cancellation request. Since we don't actuall support
AE at all, let's just respect the cancellation expecation in
case it's requested
Fixes: 333865684
Test: StillCaptureTest#testAePrecaptureTriggerCancelJpegCapture
Change-Id: I863219bc8740307ebf93d43c9b2f9b71eb683c9a
diff --git a/services/camera/virtualcamera/VirtualCameraRenderThread.cc b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
index 50b5709..ca62cce 100644
--- a/services/camera/virtualcamera/VirtualCameraRenderThread.cc
+++ b/services/camera/virtualcamera/VirtualCameraRenderThread.cc
@@ -109,7 +109,14 @@
.setControlAeLock(ANDROID_CONTROL_AE_LOCK_OFF)
.setControlAeMode(ANDROID_CONTROL_AE_MODE_ON)
.setControlAePrecaptureTrigger(
- ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE)
+ // Limited devices are expected to have precapture ae enabled and
+ // respond to cancellation request. Since we don't actuall support
+ // AE at all, let's just respect the cancellation expectation in
+ // case it's requested
+ requestSettings.aePrecaptureTrigger ==
+ ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL
+ ? ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_CANCEL
+ : ANDROID_CONTROL_AE_PRECAPTURE_TRIGGER_IDLE)
.setControlAeState(ANDROID_CONTROL_AE_STATE_INACTIVE)
.setControlAfMode(ANDROID_CONTROL_AF_MODE_OFF)
.setControlAfTrigger(ANDROID_CONTROL_AF_TRIGGER_IDLE)