| commit | fa5ca7232539a5670e010b008b21b1e8b4409ee5 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Thu Mar 16 22:59:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Mar 16 22:59:28 2017 +0000 |
| tree | dfd614a98082c60ad4779ef53bd15115be50d037 | |
| parent | 50128c4d57d1498176fbae2926961e7f1db3ade2 [diff] | |
| parent | 2e8113576a6c58fc293b0e61795c8312535a7371 [diff] |
Merge "camera2: Take sync latency into account in testPreviewFpsRange" into marshmallow-cts-dev am: 2e8113576a Change-Id: I4637aa9a734c5d88c0daf379809a170e577c6979
diff --git a/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java b/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java index 06daa51..952b6ff 100644 --- a/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java +++ b/tests/camera/src/android/hardware/camera2/cts/SurfaceViewPreviewTest.java
@@ -360,6 +360,8 @@ resultListener = new SimpleCaptureCallback(); mSession.setRepeatingRequest(requestBuilder.build(), resultListener, mHandler); + waitForSettingsApplied(resultListener, NUM_FRAMES_WAITED_FOR_UNKNOWN_LATENCY); + verifyPreviewTargetFpsRange(resultListener, NUM_FRAMES_VERIFIED, fpsRange, maxPreviewSz); }