From 49cb038af11876a9fe1155dea33fc4109768359b Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Thu, 30 Mar 2023 19:17:33 -0700 Subject: [PATCH] Camera: VTS: Fail test if availableSettingsOverride is empty If availableSettingsOverride key is in CameraCharacteristics, it must contains at least OFF. Test: atest VtsAidlHalCameraProvider_TargetTest Bug: 272546819 Change-Id: If6fb7275fc1191947dc120c9873274f4a1883720 --- camera/provider/aidl/vts/camera_aidl_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index 64507feb07..ee0c518b39 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp @@ -336,7 +336,7 @@ void CameraAidlTest::verifySettingsOverrideCharacteristics(const camera_metadata 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++) {