Merge branch 'master' into tc-idm-4.3-(python)

project-chip · May 24, 2024 · 3eee95e · 3eee95e
2 parents 759dd8c + 32a84b4
commit 3eee95e
Show file tree

Hide file tree

Showing 21 changed files with 1,011 additions and 87 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,25 +7,29 @@
         "${workspaceFolder}/build/default/src/lib/**",
         "${workspaceFolder}/config/standalone/",
         "${workspaceFolder}/config/standalone/**",
+        "${workspaceFolder}/darwin/Framework/CHIP/**",
         "${workspaceFolder}/examples/**",
         "${workspaceFolder}/src/**",
+        "${workspaceFolder}/src/app/**",
+        "${workspaceFolder}/src/ble/**",
+        "${workspaceFolder}/src/controller/**",
+        "${workspaceFolder}/src/credentials/**",
+        "${workspaceFolder}/src/crypto/**",
+        "${workspaceFolder}/src/darwin/**",
         "${workspaceFolder}/src/include/",
         "${workspaceFolder}/src/include/**",
+        "${workspaceFolder}/src/inet/**",
         "${workspaceFolder}/src/lib/**",
-        "${workspaceFolder}/src/system/**",
-        "${workspaceFolder}/third_party/nlassert/repo/include/**",
-        "${workspaceFolder}/third_party/nlio/repo/include/**",
-        "${workspaceFolder}/darwin/Framework/CHIP/**",
+        "${workspaceFolder}/src/lwip/**",
         "${workspaceFolder}/src/messaging/**",
+        "${workspaceFolder}/src/platform/**",
         "${workspaceFolder}/src/protocols/**",
+        "${workspaceFolder}/src/setup_payload/**",
+        "${workspaceFolder}/src/system/**",
         "${workspaceFolder}/src/tracing/**",
         "${workspaceFolder}/src/transport/**",
-        "${workspaceFolder}/src/inet/**",
-        "${workspaceFolder}/src/credentials/**",
-        "${workspaceFolder}/src/data_model/**",
-        "${workspaceFolder}/src/app/**",
-        "${workspaceFolder}/src/crytpo/**",
-        "${workspaceFolder}/src/platform/**"
+        "${workspaceFolder}/third_party/nlassert/repo/include/**",
+        "${workspaceFolder}/third_party/nlio/repo/include/**"
     ],
     "[cpp]": {
         "editor.defaultFormatter": "xaver.clang-format"

diff --git a/src/app/tests/suites/TestAccessControlConstraints.yaml b/src/app/tests/suites/TestAccessControlConstraints.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: User Label Cluster Tests
+name: Test Access Control Constraints
 
 config:
     nodeId: 0x12344321

diff --git 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();