Don't expire failsafe when commissioning window closes (#19695)

No longer expire the failsafe timer when the commission window closes either due to open window timeout or RevokeCommissioning command
project-chip · Aug 9, 2022 · 1631428 · 1631428
1 parent ee24a7a
commit 1631428
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp
@@ -103,8 +103,6 @@ void CommissioningWindowManager::ResetState()
 void CommissioningWindowManager::Cleanup()
 {
  StopAdvertisement(/* aShuttingDown = */ false);
- ExpireFailSafeIfArmed();
-
  ResetState();
 }
 

diff --git a/src/app/server/CommissioningWindowManager.h b/src/app/server/CommissioningWindowManager.h
@@ -90,7 +90,6 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate,
  void OnSessionEstablished(const SessionHandle & session) override;
 
  void Shutdown();
- void Cleanup();
 
  void OnPlatformEvent(const DeviceLayer::ChipDeviceEvent * event);
 
@@ -130,6 +129,8 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate,
  // differently.
  void ResetState();
 
+ void Cleanup();
+
  /**
  * Function that gets called when our commissioning window timeout timer
  * fires.