Reset Android icd storage before init (project-chip#37396)

yunhanw-google · web-flow · commit 577b3f2be0e5 · 2025-02-05T04:49:15.000Z
diff --git a/src/controller/java/AndroidDeviceControllerWrapper.cpp b/src/controller/java/AndroidDeviceControllerWrapper.cpp
@@ -159,6 +159,9 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(
         chip::Credentials::SetDeviceAttestationVerifier(GetDefaultDACVerifier(testingRootStore));
     }
 
+    // Because garbage collection may delay the removal of old controller instances, two instances could temporarily exist.
+    // To avoid issues with the shared ICD client storage, reset the storage before creating a new controller.
+    getICDClientStorage()->Shutdown();
     *errInfoOnFailure = getICDClientStorage()->Init(wrapperStorage, &wrapper->mSessionKeystore);
     if (*errInfoOnFailure != CHIP_NO_ERROR)
     {

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ AndroidDeviceControllerWrapper * AndroidDeviceControllerWrapper::AllocateNew(`
`159`	`159`	`chip::Credentials::SetDeviceAttestationVerifier(GetDefaultDACVerifier(testingRootStore));`
`160`	`160`	`}`
`161`	`161`
	`162`	`+ // Because garbage collection may delay the removal of old controller instances, two instances could temporarily exist.`
	`163`	`+ // To avoid issues with the shared ICD client storage, reset the storage before creating a new controller.`
	`164`	`+ getICDClientStorage()->Shutdown();`
`162`	`165`	`*errInfoOnFailure = getICDClientStorage()->Init(wrapperStorage, &wrapper->mSessionKeystore);`
`163`	`166`	`if (*errInfoOnFailure != CHIP_NO_ERROR)`
`164`	`167`	`{`