commit 8fca9cd84de57187b0a04e9b5bdc9bede129357c
author Jayant Chowdhary <jchowdhary@google.com> Wed Jan 17 18:48:17 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 17 18:48:17 2024 +0000
tree 2fa7aab2916af9bee1f8e607aa7cab0df2b9462f
parent 7b1e7ce836916ccec93d5c851c20ef23d1310535
parent 571cbf1b4c50efbd65ea81c63598413a28121d78

Merge "camera vts: Remove redundant capabilities fetch" into main

camera/provider/aidl/vts/camera_aidl_test.cpp

diff --git a/camera/provider/aidl/vts/camera_aidl_test.cpp b/camera/provider/aidl/vts/camera_aidl_test.cpp
index 4fc01bf..7958da9 100644
--- a/camera/provider/aidl/vts/camera_aidl_test.cpp
+++ b/camera/provider/aidl/vts/camera_aidl_test.cpp
@@ -316,14 +316,11 @@
 
 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++) {