Merge branch 'master' into launch-contentapp-on-command

examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

@@ -2731,8 +2731,8 @@ cluster OvenMode = 73 {
   command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
 }
 
-/** This cluster supports remotely monitoring and controling the different typs of
-            functionality available to a drying device, such as a laundry dryer. */
+/** This cluster provides a way to access options associated with the operation of
+            a laundry dryer device type. */
 cluster LaundryDryerControls = 74 {
   revision 1;
 

src/app/zap-templates/zcl/data-model/chip/laundry-dryer-controls-cluster.xml

@@ -33,8 +33,8 @@ limitations under the License.
         <define>LAUNDRY_DRYER_CONTROLS_CLUSTER</define>
         <client init="false" tick="false">true</client>
         <server init="false" tick="false">true</server>
-        <description>This cluster supports remotely monitoring and controling the different typs of
-            functionality available to a drying device, such as a laundry dryer.</description>
+        <description>This cluster provides a way to access options associated with the operation of
+            a laundry dryer device type.</description>
 
         <globalAttribute side="either" code="0xFFFD" value="1" />
 

src/controller/data_model/controller-clusters.matter

@@ -2933,8 +2933,8 @@ cluster OvenMode = 73 {
   command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0;
 }
 
-/** This cluster supports remotely monitoring and controling the different typs of
-            functionality available to a drying device, such as a laundry dryer. */
+/** This cluster provides a way to access options associated with the operation of
+            a laundry dryer device type. */
 cluster LaundryDryerControls = 74 {
   revision 1;
 

src/darwin/Framework/CHIP/MTRDevice.mm

@@ -60,6 +60,9 @@
 
 #define kSecondsToWaitBeforeMarkingUnreachableAfterSettingUpSubscription 10
 
+// Disabling pending crashes
+#define ENABLE_CONNECTIVITY_MONITORING 0
+
 // Consider moving utility classes to their own file
 #pragma mark - Utility Classes
 
@@ -1381,15 +1384,15 @@ - (void)_handleResubscriptionNeededWithDelay:(NSNumber *)resubscriptionDelayMs
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, resubscriptionDelayNs), self.queue, resubscriptionBlock);
     }
 
-    // Set up connectivity monitoring in case network routability changes for the positive, to accellerate resubscription
+    // Set up connectivity monitoring in case network routability changes for the positive, to accelerate resubscription
     [self _setupConnectivityMonitoring];
 }
 
 - (void)_handleSubscriptionReset:(NSNumber * _Nullable)retryDelay
 {
     std::lock_guard lock(_lock);
 
-    // If we are here, then either we failed to establish initil CASE, or we
+    // If we are here, then either we failed to establish initial CASE, or we
     // failed to send the initial SubscribeRequest message, or our ReadClient
     // has given up completely.  Those all count as "we have tried and failed to
     // subscribe".
@@ -2253,6 +2256,7 @@ - (void)_createDataVersionFilterListFromDictionary:(NSDictionary<MTRClusterPath
 
 - (void)_setupConnectivityMonitoring
 {
+#if ENABLE_CONNECTIVITY_MONITORING
     // Dispatch to own queue first to avoid deadlock with syncGetCompressedFabricID
     dispatch_async(self.queue, ^{
         // Get the required info before setting up the connectivity monitor
@@ -2277,6 +2281,7 @@ - (void)_setupConnectivityMonitoring
                                                    errorHandler:nil];
         } queue:self.queue];
     });
+#endif
 }
 
 - (void)_stopConnectivityMonitoring