summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-08-01 23:49:15 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-08-01 23:49:15 +0000
commit875ff84569aca58f5a9795999911c742c779e917 (patch)
treea8134fe76b98f89762107d392e666e973d31218c
parentecb8ea4ac451e8cf4c632a9afc43885c4f3c881c (diff)
parentfe108953037b603a6dbb8445a3744ef599dd2229 (diff)
downloadcts-875ff84569aca58f5a9795999911c742c779e917.tar.gz
Merge "Camera: Fix testJpegBurst flake" into stage-aosp-udc-ts-dev am: fe10895303
Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/24265670 Change-Id: Ib33b63031d5627fa38f29e3fd29c31b2993ab66a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
index ca9d75d3ad0..f306bd97278 100644
--- a/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/BurstCaptureTest.java
@@ -269,8 +269,10 @@ public class BurstCaptureTest extends Camera2SurfaceViewTestCase {
// Wait for first result with locking
resultListener.drain();
+ // Add 1 extra frame to wait due to earlier repeating request could introduce
+ // 1 more frame delay.
CaptureResult lockedResult =
- resultListener.getCaptureResultForRequest(lockedRequest, maxPipelineDepth);
+ resultListener.getCaptureResultForRequest(lockedRequest, maxPipelineDepth + 1);
int pipelineDepth = lockedResult.get(CaptureResult.REQUEST_PIPELINE_DEPTH);