diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index 330a470b53..2ae48535f1 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -100,6 +100,7 @@ using ::android::hardware::kSynchronizedReadWrite; using ResultMetadataQueue = MessageQueue; using ::android::hidl::manager::V1_0::IServiceManager; +const char kCameraPassthroughServiceName[] = "legacy/0"; const char *kProviderFQName = "android.hardware.camera.provider@2.4::ICameraProvider"; const uint32_t kMaxPreviewWidth = 1920; const uint32_t kMaxPreviewHeight = 1080; @@ -257,6 +258,20 @@ void CameraHidlEnvironment::SetUp() { } }); + std::string legacyName; + uint32_t legacyId; + ASSERT_TRUE(parseProviderName(kCameraPassthroughServiceName, + &legacyName /*out*/, &legacyId /*out*/)); + auto legacyIt = mProviders.find(legacyName); + //Add any legacy passthrough implementations + if (legacyIt == mProviders.end()) { + sp provider = ICameraProvider::tryGetService( + kCameraPassthroughServiceName); + if (nullptr != provider.get()) { + mProviders.emplace(legacyName, provider); + } + } + ASSERT_FALSE(mProviders.empty()); }