Merge branch 'master' into feature/electrical_energy_measurement

andy31415 · andy31415 · commit b1382e0a962d · 2023-12-06T11:37:33.000-05:00
diff --git a/src/darwin/Framework/CHIP/MTRDemuxingStorage.mm b/src/darwin/Framework/CHIP/MTRDemuxingStorage.mm
@@ -159,6 +159,9 @@ static bool IsMemoryOnlyGlobalKey(NSString * key)
     // We do not expect to see the "g/ts/tts", "g/ts/dntp", "g/ts/tz",
     // "g/ts/dsto" Time Synchronization keys.
 
+    // We do not expect to see the "g/icd/cic" key; that's only used for an ICD
+    // that sends check-in messages.
+
     return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -159,6 +159,9 @@ static bool IsMemoryOnlyGlobalKey(NSString * key)`
`159`	`159`	`// We do not expect to see the "g/ts/tts", "g/ts/dntp", "g/ts/tz",`
`160`	`160`	`// "g/ts/dsto" Time Synchronization keys.`
`161`	`161`
	`162`	`+ // We do not expect to see the "g/icd/cic" key; that's only used for an ICD`
	`163`	`+ // that sends check-in messages.`
	`164`	`+`
`162`	`165`	`return false;`
`163`	`166`	`}`
`164`	`167`