From 23f338bac4eb995f0920a124633732b6e17ccf47 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Tue, 16 Jan 2024 18:35:09 +0000 Subject: [PATCH] camera vts: Remove redundant capabilities fetch Bug: 299202800 Test: build Merged-In: Ia6ca1ee0fb65e357398ba62c6a787c6530b989e4 Change-Id: Ia6ca1ee0fb65e357398ba62c6a787c6530b989e4 Signed-off-by: Jayant Chowdhary (cherry picked from commit 571cbf1b4c50efbd65ea81c63598413a28121d78) --- camera/provider/aidl/vts/camera_aidl_test.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp index cf657c1685..9559a1e965 100644 --- a/camera/provider/aidl/vts/camera_aidl_test.cpp +++ b/camera/provider/aidl/vts/camera_aidl_test.cpp @@ -310,14 +310,11 @@ void CameraAidlTest::verifyMonochromeCameraResult( void CameraAidlTest::verifyStreamUseCaseCharacteristics(const camera_metadata_t* metadata) { camera_metadata_ro_entry entry; - // Check capabilities - int retcode = - find_camera_metadata_ro_entry(metadata, ANDROID_REQUEST_AVAILABLE_CAPABILITIES, &entry); bool hasStreamUseCaseCap = supportsStreamUseCaseCap(metadata); bool supportMandatoryUseCases = false; - retcode = find_camera_metadata_ro_entry(metadata, ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES, - &entry); + int retcode = find_camera_metadata_ro_entry(metadata, ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES, + &entry); if ((0 == retcode) && (entry.count > 0)) { supportMandatoryUseCases = true; for (size_t i = 0; i < kMandatoryUseCases.size(); i++) {