| commit | 4afd8db14eb4079ec298f462e30d49c6f72ee2b0 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 04 05:28:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 04 05:28:34 2023 +0000 |
| tree | 04cb8df9422691c4f0cb4de5c54c2c0226b069ca | |
| parent | 4d82fa4591bdc9f079cadf29b9b9a26641cde7a5 [diff] | |
| parent | 90c8cd9a3bf49e5a781b2c3cffdf1dd9e0eb8bb3 [diff] |
Merge "Camera: VTS: Fail test if availableSettingsOverride is empty" into udc-dev am: 90c8cd9a3b Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/22365839 Change-Id: Ibb29ee58aedf2d0bf87be4e4d7554ff2d386f216 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index c315879..fd41335 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -336,7 +336,7 @@ int retcode = find_camera_metadata_ro_entry(metadata, ANDROID_CONTROL_AVAILABLE_SETTINGS_OVERRIDES, &entry); bool supportSettingsOverride = false; - if ((0 == retcode) && (entry.count > 0)) { + if (0 == retcode) { supportSettingsOverride = true; bool hasOff = false; for (size_t i = 0; i < entry.count; i++) {