[nrfconnect] Fix initialization order of DeviceInfoProvider (project-chip#43073)

After moving the UserLabel and FixedLabel initialization to
code-driven, we must change the initialization order for
SetDeviceInfoProvider to ensure that it is intialized before
Matter server.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

examples/all-clusters-app/nrfconnect/main/AppTask.cpp

@@ -266,6 +266,9 @@ CHIP_ERROR AppTask::Init()
     initParams.endpointNativeParams    = static_cast<void *>(&nativeParams);
 #endif
 
+    gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
     AppFabricTableDelegate::Init();
 
@@ -279,9 +282,6 @@ CHIP_ERROR AppTask::Init()
     }
 #endif
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
-    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
-
     // We only have network commissioning on endpoint 0.
     emberAfEndpointEnableDisable(kNetworkCommissioningEndpointSecondary, false);
     ConfigurationMgr().LogDeviceConfig();

examples/all-clusters-app/nrfconnect/prj.conf

@@ -63,3 +63,6 @@ CONFIG_PM_PARTITION_SIZE_SETTINGS_STORAGE=0x8000
 
 # Increase heap size
 CONFIG_CHIP_MALLOC_SYS_HEAP_SIZE=32768
+
+# Enable VerifyOrDie logging
+CONFIG_CHIP_LOG_VERIFY_OR_DIE=y

examples/light-switch-app/nrfconnect/main/AppTask.cpp

@@ -247,6 +247,10 @@ CHIP_ERROR AppTask::Init()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     initParams.dataModelProvider        = chip::app::CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
@@ -262,9 +266,6 @@ CHIP_ERROR AppTask::Init()
     }
 #endif
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
-    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
-
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(RendezvousInformationFlags(RendezvousInformationFlag::kBLE));
 

examples/light-switch-app/nrfconnect/prj.conf

@@ -55,3 +55,6 @@ CONFIG_CHIP_FACTORY_DATA_BUILD=y
 
 # Enable the Read Client for binding purposes
 CONFIG_CHIP_ENABLE_READ_CLIENT=y
+
+# Enable VerifyOrDie logging
+CONFIG_CHIP_LOG_VERIFY_OR_DIE=y

examples/lighting-app/nrfconnect/main/AppTask.cpp

@@ -284,6 +284,9 @@ CHIP_ERROR AppTask::Init()
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
     VerifyOrDie(gSimpleAttributePersistence.Init(initParams.persistentStorageDelegate) == CHIP_NO_ERROR);
 
+    gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     initParams.dataModelProvider        = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
@@ -299,8 +302,6 @@ CHIP_ERROR AppTask::Init()
     }
 #endif
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
-    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
     app::SetAttributePersistenceProvider(&gDeferredAttributePersister);
 
     ConfigurationMgr().LogDeviceConfig();

examples/lighting-app/nrfconnect/prj.conf

@@ -57,3 +57,6 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
+
+# Enable VerifyOrDie logging
+CONFIG_CHIP_LOG_VERIFY_OR_DIE=y

examples/lit-icd-app/nrfconnect/main/AppTask.cpp

@@ -216,6 +216,10 @@ CHIP_ERROR AppTask::Init()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     initParams.dataModelProvider        = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
@@ -231,8 +235,6 @@ CHIP_ERROR AppTask::Init()
     }
 #endif
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
-    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlag(chip::RendezvousInformationFlag::kBLE));
 

examples/lit-icd-app/nrfconnect/prj.conf

@@ -53,3 +53,6 @@ CONFIG_CHIP_ENABLE_ICD_SUPPORT=y
 CONFIG_CHIP_ICD_LIT_SUPPORT=y
 CONFIG_CHIP_ICD_DSLS_SUPPORT=y
 CONFIG_CHIP_ICD_SIT_SLOW_POLL_LIMIT=5000
+
+# Enable VerifyOrDie logging
+CONFIG_CHIP_LOG_VERIFY_OR_DIE=y

examples/lock-app/nrfconnect/main/AppTask.cpp

@@ -244,6 +244,10 @@ CHIP_ERROR AppTask::Init()
     initParams.operationalKeystore = &sPSAOperationalKeystore;
 #endif
     (void) initParams.InitializeStaticResourcesBeforeServerInit();
+
+    gExampleDeviceInfoProvider.SetStorageDelegate(initParams.persistentStorageDelegate);
+    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
+
     initParams.dataModelProvider        = CodegenDataModelProviderInstance(initParams.persistentStorageDelegate);
     initParams.testEventTriggerDelegate = &sTestEventTriggerDelegate;
     ReturnErrorOnFailure(chip::Server::GetInstance().Init(initParams));
@@ -259,8 +263,6 @@ CHIP_ERROR AppTask::Init()
     }
 #endif
 
-    gExampleDeviceInfoProvider.SetStorageDelegate(&Server::GetInstance().GetPersistentStorage());
-    chip::DeviceLayer::SetDeviceInfoProvider(&gExampleDeviceInfoProvider);
     ConfigurationMgr().LogDeviceConfig();
     PrintOnboardingCodes(chip::RendezvousInformationFlags(chip::RendezvousInformationFlag::kBLE));
 

examples/lock-app/nrfconnect/prj.conf

@@ -46,3 +46,6 @@ CONFIG_USE_SEGGER_RTT=n
 # Enable Factory Data feature
 CONFIG_CHIP_FACTORY_DATA=y
 CONFIG_CHIP_FACTORY_DATA_BUILD=y
+
+# Enable VerifyOrDie logging
+CONFIG_CHIP_LOG_VERIFY_OR_DIE=y