AdvancedExtension: Enable night extension zoom and AF controls
Devices launching with Android V are required to support zoom
and AF camera controls in the corresponding night extension
implementation.
Bug: 337202271
Test:
atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testAFMetering
atest -c -d cts/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java#testZoomRatio
Change-Id: Ie1d66fc4a4a5eaf2b0cf5d3132759b4c04010744
diff --git a/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java b/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java
index d39d894..86ea363 100644
--- a/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java
+++ b/camera2/extensions/advancedSample/src/java/androidx/camera/extensions/impl/advanced/NightAdvancedExtenderImpl.java
@@ -40,6 +40,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -330,4 +331,22 @@
public SessionProcessorImpl createSessionProcessor() {
return new NightAdvancedSessionProcessor();
}
+
+ @Override
+ public List<CaptureRequest.Key> getAvailableCaptureRequestKeys() {
+ final CaptureRequest.Key [] CAPTURE_REQUEST_SET = {CaptureRequest.CONTROL_ZOOM_RATIO,
+ CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_REGIONS,
+ CaptureRequest.CONTROL_AF_TRIGGER, CaptureRequest.JPEG_QUALITY,
+ CaptureRequest.JPEG_ORIENTATION};
+ return Arrays.asList(CAPTURE_REQUEST_SET);
+ }
+
+ @Override
+ public List<CaptureResult.Key> getAvailableCaptureResultKeys() {
+ final CaptureResult.Key [] CAPTURE_RESULT_SET = {CaptureResult.CONTROL_ZOOM_RATIO,
+ CaptureResult.CONTROL_AF_MODE, CaptureResult.CONTROL_AF_REGIONS,
+ CaptureResult.CONTROL_AF_TRIGGER, CaptureResult.CONTROL_AF_STATE,
+ CaptureResult.JPEG_QUALITY, CaptureResult.JPEG_ORIENTATION};
+ return Arrays.asList(CAPTURE_RESULT_SET);
+ }
}
