Modify android chiptool crash

joonhaengHeo · joonhaengHeo · commit ad53e1e8d3b1 · 2024-04-03T08:01:18.000+09:00
diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp
@@ -1771,12 +1771,12 @@ void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId
     if (completionStatus.err == CHIP_NO_ERROR)
     {
         CommissioneeDeviceProxy * commissionee = FindCommissioneeDevice(nodeId);
+        CommissioningStageComplete(CHIP_NO_ERROR);
         if (commissionee != nullptr)
         {
             ReleaseCommissioneeDevice(commissionee);
         }
         // Send the callbacks, we're done.
-        CommissioningStageComplete(CHIP_NO_ERROR);
         SendCommissioningCompleteCallbacks(nodeId, mCommissioningCompletionStatus);
     }
     else if (completionStatus.err == CHIP_ERROR_CANCELLED)

Original file line number	Diff line number	Diff line change
`@@ -1771,12 +1771,12 @@ void DeviceCommissioner::CleanupCommissioning(DeviceProxy * proxy, NodeId nodeId`
`1771`	`1771`	`if (completionStatus.err == CHIP_NO_ERROR)`
`1772`	`1772`	`{`
`1773`	`1773`	`CommissioneeDeviceProxy * commissionee = FindCommissioneeDevice(nodeId);`
	`1774`	`+ CommissioningStageComplete(CHIP_NO_ERROR);`
`1774`	`1775`	`if (commissionee != nullptr)`
`1775`	`1776`	`{`
`1776`	`1777`	`ReleaseCommissioneeDevice(commissionee);`
`1777`	`1778`	`}`
`1778`	`1779`	`// Send the callbacks, we're done.`
`1779`		`- CommissioningStageComplete(CHIP_NO_ERROR);`
`1780`	`1780`	`SendCommissioningCompleteCallbacks(nodeId, mCommissioningCompletionStatus);`
`1781`	`1781`	`}`
`1782`	`1782`	`else if (completionStatus.err == CHIP_ERROR_CANCELLED)`