Merge branch 'master' into bugfix/closure_cadmin__test_failure

Author: sabollim-silabs

docs/development_controllers/matter-repl/python_chip_controller_advanced_usage.md

@@ -225,7 +225,7 @@ then you can use `bt` (for `backtrace`) to see the backtrace of the call stack.
 #0  chip::Controller::DeviceCommissioner::PairDevice
     (this=0x7fffd8003a90, remoteDeviceId=1234, setUpCode=0x7fffef2555d0 "MT:-24J0AFN00KA0648G00", params=..., discoveryType=chip::Controller::DiscoveryType::kAll, resolutionData=...)
     at ../../src/controller/CHIPDeviceController.cpp:646
-#1  0x00007fffed040825 in pychip_DeviceController_ConnectWithCode (devCtrl=0x7fffd8003a90, onboardingPayload=0x7fffef2555d0 "MT:-24J0AFN00KA0648G00", nodeid=1234, discoveryType=2 '\002')
+#1  0x00007fffed040825 in pychip_DeviceController_ConnectWithCode (devCtrl=0x7fffd8003a90, onboardingPayload=0x7fffef2555d0 "MT:-24J0AFN00KA0648G00", nodeId=1234, discoveryType=2 '\002')
     at ../../src/controller/python/ChipDeviceController-ScriptBinding.cpp:395
 #2  0x00007ffff6ad5596 in ??? () at /usr/lib/libffi.so.8
 #3  0x00007ffff6ad200e in ??? () at /usr/lib/libffi.so.8

docs/testing/python.md

@@ -323,7 +323,7 @@ Example for setting callbacks:
 cb = EventSubscriptionHandler(cluster, cluster_id, event_id)
 
 urgent = 1
-subscription = await dev_ctrl.ReadEvent(nodeid=1, events=[(1, event, urgent)], reportInterval=[1, 3])
+subscription = await dev_ctrl.ReadEvent(nodeId=1, events=[(1, event, urgent)], reportInterval=[1, 3])
 subscription.SetEventUpdateCallback(callback=cb)
 
 try:
@@ -344,7 +344,7 @@ PyChipError
 Example:
 
 ```python
-res = await devCtrl.WriteAttribute(nodeid=0, attributes=[(0,Clusters.BasicInformation.Attributes.NodeLabel("Test"))])
+res = await devCtrl.WriteAttribute(nodeId=0, attributes=[(0,Clusters.BasicInformation.Attributes.NodeLabel("Test"))])
 asserts.assert_equal(ret[0].status, Status.Success, "write failed")
 ```
 

docs/testing/yaml.md

@@ -271,12 +271,33 @@ the test harness. Note that full-test gating is not currently implemented in the
 local runner or in the CI.
 
 Some test steps need to be gated on values from earlier in the test. In these
-cases, PICS cannot be used. Instead, the runIf: tag can be used. This tag
+cases, PICS cannot be used. Instead, the `runIf` tag can be used. This tag
 requires a boolean value. To convert values to booleans, the TestEqualities
 function can be use. See
 [TestEqualities](https://github.com/project-chip/connectedhomeip/blob/master/src/app/tests/suites/TestEqualities.yaml)
 for an example of how to use this pseudo-cluster.
 
+In addition to the `PICS` and `runIf` tags, there are the `minRevision` and
+`maxRevision` tags which use the step's `cluster`'s `ClusterRevision` attribute
+to determine if a step should be skipped because it only applies to older or
+newer versions. A step will be skipped if the cluster's `ClusterRevision`
+attribute is < `minRevision` (if present), or > `maxRevision` (if present).
+
+Here is an example of only checking for the value of a given attribute if
+`ClusterRevision` >= 3 using `minRevision`.
+
+```yaml
+- label: "Verify the minimum-to-support Max Paths Per Invoke value"
+  command: "readAttribute"
+  attribute: "MaxPathsPerInvoke"
+  minRevision:
+      3 # Attribute was added in revision 3, so this step applies
+      # to revision >= 3.
+  response:
+      constraints:
+          minValue: 1
+```
+
 #### Setting step timeouts
 
 The timeout argument can be used for each individual test step to set the time

docs/testing/yaml_schema.md

@@ -76,3 +76,5 @@ YAML schema
 |  dataVersion |list,int|Y|
 |  busyWaitMs |int||
 |  wait |str||
+|  minRevision |int|Y|
+|  maxRevision |int|Y|

examples/air-purifier-app/ameba/main/chipinterface.cpp

@@ -154,7 +154,7 @@ static void InitServer(intptr_t context)
     const Optional<app::TermsAndConditions> termsAndConditions = Optional<app::TermsAndConditions>(
         app::TermsAndConditions(CHIP_AMEBA_TC_REQUIRED_ACKNOWLEDGEMENTS, CHIP_AMEBA_TC_MIN_REQUIRED_VERSION));
     PersistentStorageDelegate & persistentStorageDelegate = Server::GetInstance().GetPersistentStorage();
-    chip::app::TermsAndConditionsManager::GetInstance()->Init(&persistentStorageDelegate, termsAndConditions);
+    chip::app::TermsAndConditionsManager::GetInstance().Init(&persistentStorageDelegate, termsAndConditions);
 #endif
 
     if (RTW_SUCCESS != wifi_is_connected_to_ap())

examples/all-clusters-app/ameba/main/chipinterface.cpp

@@ -160,7 +160,7 @@ static void InitServer(intptr_t context)
     const Optional<app::TermsAndConditions> termsAndConditions = Optional<app::TermsAndConditions>(
         app::TermsAndConditions(CHIP_AMEBA_TC_REQUIRED_ACKNOWLEDGEMENTS, CHIP_AMEBA_TC_MIN_REQUIRED_VERSION));
     PersistentStorageDelegate & persistentStorageDelegate = Server::GetInstance().GetPersistentStorage();
-    chip::app::TermsAndConditionsManager::GetInstance()->Init(&persistentStorageDelegate, termsAndConditions);
+    chip::app::TermsAndConditionsManager::GetInstance().Init(&persistentStorageDelegate, termsAndConditions);
 #endif
 
     NetWorkCommissioningInstInit();

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/GenericChipDeviceListener.kt

@@ -37,6 +37,10 @@ open class GenericChipDeviceListener : ChipDeviceController.CompletionListener {
     // No op
   }
 
+  override fun onCommissioningStageStart(nodeId: Long, stage: String) {
+    // No op
+  }
+
   override fun onNotifyChipConnectionClosed() {
     // No op
   }

examples/camera-app/camera-common/include/media-controller/media-controller.h

@@ -43,6 +43,9 @@ class MediaController
     // Transports must first unregister from the media-controller when they are
     // getting destroyed.
     virtual void UnregisterTransport(Transport * transport) = 0;
+    // Get transport registered for a specific stream ID
+    virtual Transport * GetTransportForVideoStream(uint16_t videoStreamID) = 0;
+    virtual Transport * GetTransportForAudioStream(uint16_t audioStreamID) = 0;
     // Media controller goes through registered transports and dispatches media
     // if the transport is ready.
     virtual void DistributeVideo(const uint8_t * data, size_t size, uint16_t videoStreamID) = 0;

examples/camera-app/camera-common/include/transport/transport.h

@@ -16,9 +16,11 @@
  *    limitations under the License.
  */
 
+#include <app-common/zap-generated/cluster-objects.h>
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <lib/core/Optional.h>
 #include <lib/support/Span.h>
 #pragma once
 // Base class for media transports(WebRTC, PushAV)
@@ -46,4 +48,9 @@ class Transport
     virtual bool CanSendAudio() = 0;
 
     virtual ~Transport() = default;
+
+    // SFrame End-to-End Encryption configuration (optional)
+    // For transport types that support SFrame (e.g., WebRTC), this will contain the encryption config.
+    // For transport types that don't support SFrame (e.g., PushAV), this will remain empty (!HasValue()).
+    chip::Optional<chip::app::Clusters::WebRTCTransportProvider::Structs::SFrameStruct::Type> sFrameConfig;
 };

examples/camera-app/linux/include/clusters/webrtc-provider/webrtc-provider-manager.h

@@ -90,6 +90,10 @@ class WebRTCProviderManager : public Delegate, public WebRTCTransportProviderCon
 
     bool HasAllocatedAudioStreams() override;
 
+    CHIP_ERROR ValidateSFrameConfig(uint16_t cipherSuite, size_t baseKeyLength) override;
+
+    CHIP_ERROR IsUTCTimeNull(bool & isNull) override;
+
     void LiveStreamPrivacyModeChanged(bool privacyModeEnabled);
 
 private: