[ICD] Shutdown icd client storage when destroying android controller (#…

…36348) * Shutdown DefautICDClientStorage when destorying Android controller * Restyled by whitespace * Update DefaultICDClientStorage.h Co-authored-by: Boris Zbarsky <[email protected]> --------- Co-authored-by: Restyled.io <[email protected]> Co-authored-by: Boris Zbarsky <[email protected]>
project-chip · Nov 13, 2024 · 6848d04 · 6848d04
1 parent 59d7388
commit 6848d04
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/app/icd/client/DefaultICDClientStorage.cpp b/src/app/icd/client/DefaultICDClientStorage.cpp
@@ -542,5 +542,14 @@ CHIP_ERROR DefaultICDClientStorage::ProcessCheckInPayload(const ByteSpan & paylo
     iterator->Release();
     return CHIP_ERROR_NOT_FOUND;
 }
+
+void DefaultICDClientStorage::Shutdown()
+{
+    mICDClientInfoIterators.ReleaseAll();
+    mpClientInfoStore = nullptr;
+    mpKeyStore        = nullptr;
+    mFabricList.clear();
+}
+
 } // namespace app
 } // namespace chip
diff --git a/src/app/icd/client/DefaultICDClientStorage.h b/src/app/icd/client/DefaultICDClientStorage.h
@@ -120,6 +120,12 @@ class DefaultICDClientStorage : public ICDClientStorage
     CHIP_ERROR ProcessCheckInPayload(const ByteSpan & payload, ICDClientInfo & clientInfo,
                                      Protocols::SecureChannel::CounterType & counter) override;
 
+    /**
+     * Shut down DefaultICDClientStorage
+     *
+     */
+    void Shutdown();
+
 #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
     size_t GetFabricListSize() { return mFabricList.size(); }
 

diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -50,6 +50,7 @@ using namespace TLV;
 
 AndroidDeviceControllerWrapper::~AndroidDeviceControllerWrapper()
 {
+    getICDClientStorage()->Shutdown();
     mController->Shutdown();
 
     if (mKeypairBridge != nullptr)