@@ -665,6 +665,7 @@ void ContentAppFactoryImpl::InstallContentApp(uint16_t vendorId, uint16_t produc
665
665
mContentApps .emplace_back (std::move (ptr));
666
666
}
667
667
668
+ #if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
668
669
// Get the list of node ids
669
670
std::set<NodeId> nodeIds = ContentAppPlatform::GetInstance ().GetNodeIdsForContentApp (vendorId, productId);
670
671
@@ -673,12 +674,12 @@ void ContentAppFactoryImpl::InstallContentApp(uint16_t vendorId, uint16_t produc
673
674
{
674
675
auto app = contentApp.get ();
675
676
676
- // if (app->MatchesPidVid(productId, vendorId))
677
- // {
678
- // CatalogVendorApp vendorApp = app->GetApplicationBasicDelegate()->GetCatalogVendorApp();
677
+ if (app->MatchesPidVid (productId, vendorId))
678
+ {
679
+ CatalogVendorApp vendorApp = app->GetApplicationBasicDelegate ()->GetCatalogVendorApp ();
679
680
680
- // GetContentAppFactoryImpl()->LoadContentApp(vendorApp);
681
- // }
681
+ GetContentAppFactoryImpl ()->LoadContentApp (vendorApp);
682
+ }
682
683
683
684
// update the list of node ids with content apps allowed vendor list
684
685
for (const auto & allowedVendor : app->GetApplicationBasicDelegate ()->GetAllowedVendorList ())
@@ -688,7 +689,7 @@ void ContentAppFactoryImpl::InstallContentApp(uint16_t vendorId, uint16_t produc
688
689
nodeIds.insert (tempNodeIds.begin (), tempNodeIds.end ());
689
690
}
690
691
}
691
- # if CHIP_DEVICE_CONFIG_ENABLE_BOTH_COMMISSIONER_AND_COMMISSIONEE
692
+
692
693
// refresh ACLs
693
694
for (const auto & nodeId : nodeIds)
694
695
{
0 commit comments