| commit | 62da080e00a1f76b9a230206da5042e64b7f58a3 | [log] [tgz] |
|---|---|---|
| author | Pierre Lee <pierre.lee@mediatek.com> | Mon Jan 21 20:29:42 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jan 21 20:29:42 2019 -0800 |
| tree | 6256e77d810bbca3a1dc13e928946cc8f323eeff | |
| parent | a9ccf13d9bcfc69becc0c4fd2ea1bc5d472f3ff2 [diff] | |
| parent | 556b0495969043c0359276a13137a97c7e48882e [diff] |
Merge "The test failed when one of the three cameras was configured with a maximum android.scaler.availableStreamConfiguration size of 1600*1200" am: ac6175ee79 am: cb516f7cca am: 556b049596 Change-Id: I40eb4709eaea843a06222c20baec61c150d5e3f5
diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 60db5df..c98e328 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp
@@ -3268,6 +3268,8 @@ continue; } + outputPreviewStreams.clear(); + ASSERT_EQ(Status::OK, getAvailableOutputStreams(staticMetaBuffer, outputPreviewStreams, &previewThreshold)); ASSERT_NE(0u, outputPreviewStreams.size());