From f721a99f8d92a1bc4aa2cac4f9b7b6ac6ec785b2 Mon Sep 17 00:00:00 2001
From: yunhanw <yunhanw@google.com>
Date: Thu, 23 May 2024 13:28:49 -0700
Subject: [PATCH] address comments

---
 src/controller/AutoCommissioner.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/controller/AutoCommissioner.cpp b/src/controller/AutoCommissioner.cpp
index bb12209c8c1409..a72543853fa2d1 100644
--- a/src/controller/AutoCommissioner.cpp
+++ b/src/controller/AutoCommissioner.cpp
@@ -125,6 +125,8 @@ CHIP_ERROR AutoCommissioner::SetCommissioningParameters(const CommissioningParam
 
     mParams = params;
 
+    mNeedIcdRegistration = false;
+
     if (haveMaybeDanglingBufferPointers)
     {
         mParams.ClearExternalBufferDependentValues();
@@ -760,7 +762,6 @@ CHIP_ERROR AutoCommissioner::CommissioningStepFinished(CHIP_ERROR err, Commissio
                 }
             }
 
-            mNeedIcdRegistration = false;
             if (mParams.GetICDRegistrationStrategy() != ICDRegistrationStrategy::kIgnore)
             {
                 if (mDeviceCommissioningInfo.icd.isLIT && mDeviceCommissioningInfo.icd.checkInProtocolSupport)