commit | 9e9343791be993889af6928385dcefdb0d20ad6d | [log] [tgz] |
---|---|---|
author | WenHung_Teng <wenhungteng@google.com> | Fri Feb 10 20:27:00 2023 +0800 |
committer | WenHung_Teng <wenhungteng@google.com> | Fri Feb 10 20:27:00 2023 +0800 |
tree | 4a71b342cef4db2746125ae2216f9f1ca8fb5734 | |
parent | 83973962d321813ee2f7c78ae15428d883de000f [diff] |
Not wait for setEV task to complete The SetEV task may timeout on certain Pixel devices For the test on the camera control verifies the request options, not really need to wait for the task to be done. Modify the code to reduce the test flaky. Test: CameraControlAdapterDeviceTest Change-Id: I4f49ee752608b27b30a49548c6ad87dafe949e24
diff --git a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt index 10e7fc0..67f3c4f 100644 --- a/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt +++ b/camera/camera-camera2-pipe-integration/src/androidTest/java/androidx/camera/camera2/pipe/integration/CameraControlAdapterDeviceTest.kt
@@ -401,6 +401,7 @@ ) = get(option_max_regions) ?: 0 private suspend fun arrangeRequestOptions() { + cameraControl.setExposureCompensationIndex(1) cameraControl.setZoomRatio(1.0f) cameraControl.camera2cameraControl.setCaptureRequestOptions( CaptureRequestOptions.Builder().setCaptureRequestOption( @@ -408,7 +409,6 @@ CONTROL_CAPTURE_INTENT_CUSTOM ).build() ).await() - cameraControl.setExposureCompensationIndex(1)[5, TimeUnit.SECONDS] // Ensure the requests are already set to the CaptureRequest. waitForResult().verify(