From 91537d184eda48506379d6b737b7951331dcc6d8 Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Fri, 5 Apr 2024 20:36:15 -0700
Subject: [PATCH 1/2] Do not report attribute in
 _getAttributesToReportWithReportedValues if an expected value is present

- The expiry timer for the expected value will take care of the reporting and we shouldn't
  report an attribute in the expected value interval if there is an existing expected value
---
 src/darwin/Framework/CHIP/MTRDevice.mm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 730a4024b4bc9b..05c742ef7f9c7f 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -2144,13 +2144,8 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
             // if expected values exists, purge and update read cache
             NSArray * expectedValue = _expectedValueCache[attributePath];
             if (expectedValue) {
-                if (![self _attributeDataValue:attributeDataValue
-                            isEqualToDataValue:expectedValue[MTRDeviceExpectedValueFieldValueIndex]]) {
-                    shouldReportAttribute = YES;
-                    previousValue = expectedValue[MTRDeviceExpectedValueFieldValueIndex];
-                }
-                _expectedValueCache[attributePath] = nil;
                 _readCache[attributePath] = attributeDataValue;
+                shouldReportAttribute = NO;
             } else if (readCacheValueChanged) {
                 // otherwise compare and update read cache
                 previousValue = _readCache[attributePath];

From 8d025d0cd7c380484924989d6ee98f46827cb162 Mon Sep 17 00:00:00 2001
From: Nivedita Sarkar <nivedita_sarkar@apple.com>
Date: Mon, 8 Apr 2024 12:38:05 -0700
Subject: [PATCH 2/2] Add the code that sets previous value in the block where
 we have an expected value

---
 src/darwin/Framework/CHIP/MTRDevice.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm
index 05c742ef7f9c7f..d0a3971849bb61 100644
--- a/src/darwin/Framework/CHIP/MTRDevice.mm
+++ b/src/darwin/Framework/CHIP/MTRDevice.mm
@@ -2144,6 +2144,7 @@ - (NSArray *)_getAttributesToReportWithReportedValues:(NSArray<NSDictionary<NSSt
             // if expected values exists, purge and update read cache
             NSArray * expectedValue = _expectedValueCache[attributePath];
             if (expectedValue) {
+                previousValue = expectedValue[MTRDeviceExpectedValueFieldValueIndex];
                 _readCache[attributePath] = attributeDataValue;
                 shouldReportAttribute = NO;
             } else if (readCacheValueChanged) {