Merge branch 'master' into telink_image_update

project-chip · Oct 21, 2023 · 4e0bbe3 · 4e0bbe3
2 parents 5ec2637 + 2f612b0
commit 4e0bbe3
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp b/src/platform/nxp/mw320/ConfigurationManagerImpl.cpp
@@ -53,7 +53,6 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
 {
     CHIP_ERROR err;
     uint32_t rebootCount = 0;
-    bool failSafeArmed;
 
     // Initialize the generic implementation base class.
     // err = Internal::GenericConfigurationManagerImpl<ConfigurationManagerImpl>::Init();
@@ -74,12 +73,6 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
         err = StoreRebootCount(1);
         SuccessOrExit(err);
     }
-    // If the fail-safe was armed when the device last shutdown, initiate a factory reset.
-    if (GetFailSafeArmed(failSafeArmed) == CHIP_NO_ERROR && failSafeArmed)
-    {
-        ChipLogProgress(DeviceLayer, "Detected fail-safe armed on reboot; initiating factory reset");
-        InitiateFactoryReset();
-    }
 
     if (!MW320Config::ConfigValueExists(MW320Config::kCounterKey_BootReason))
     {