diff --git a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp index e0e3a0e9c4..9fa4df2cf4 100644 --- a/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp +++ b/camera/provider/aidl/vts/VtsAidlHalCameraProvider_TargetTest.cpp @@ -165,26 +165,21 @@ TEST_P(CameraAidlTest, getResourceCost) { // Validate the integrity of manual flash strength control metadata TEST_P(CameraAidlTest, validateManualFlashStrengthControlKeys) { - if (flags::camera_manual_flash_strength_control()) { - std::vector cameraDeviceNames = getCameraDeviceNames(mProvider); - for (const auto& name : cameraDeviceNames) { - ALOGI("validateManualFlashStrengthControlKeys: Testing camera device %s", name.c_str()); - CameraMetadata meta; - std::shared_ptr cameraDevice; - openEmptyDeviceSession(name, mProvider, &mSession /*out*/, &meta /*out*/, - &cameraDevice /*out*/); - ndk::ScopedAStatus ret = cameraDevice->getCameraCharacteristics(&meta); - ASSERT_TRUE(ret.isOk()); - const camera_metadata_t* staticMeta = - reinterpret_cast(meta.metadata.data()); - verifyManualFlashStrengthControlCharacteristics(staticMeta); - ret = mSession->close(); - mSession = nullptr; - ASSERT_TRUE(ret.isOk()); - } - } else { - ALOGI("validateManualFlashStrengthControlKeys: Test skipped.\n"); - GTEST_SKIP(); + std::vector cameraDeviceNames = getCameraDeviceNames(mProvider); + for (const auto& name : cameraDeviceNames) { + ALOGI("validateManualFlashStrengthControlKeys: Testing camera device %s", name.c_str()); + CameraMetadata meta; + std::shared_ptr cameraDevice; + openEmptyDeviceSession(name, mProvider, &mSession /*out*/, &meta /*out*/, + &cameraDevice /*out*/); + ndk::ScopedAStatus ret = cameraDevice->getCameraCharacteristics(&meta); + ASSERT_TRUE(ret.isOk()); + const camera_metadata_t* staticMeta = + reinterpret_cast(meta.metadata.data()); + verifyManualFlashStrengthControlCharacteristics(staticMeta); + ret = mSession->close(); + mSession = nullptr; + ASSERT_TRUE(ret.isOk()); } }