- https://github.com/project-chip/connectedhomeip/pull/26082/files#r1…

…242671601 - https://github.com/project-chip/connectedhomeip/pull/26082/files#r1242676471 - project-chip#26082 (comment) - project-chip#26082 (comment) - project-chip#26082 (comment) - restyle
fessehaeve · Mar 28, 2024 · a6aa458 · a6aa458
1 parent 5da7104
commit a6aa458
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -3826,7 +3826,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "1",
+              "defaultValue": "2",
               "reportable": 1,
               "minInterval": 1,
               "maxInterval": 65534,

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -551,8 +551,8 @@ CHIP_ERROR TimeSynchronizationServer::SetTimeZone(const DataModel::DecodableList
     if (lastTzState != TimeState::kInvalid)
     {
         const TimeSyncDataProvider::TimeZoneStore & tzStore = GetTimeZone()[0];
-        lastTz.offset        = tzStore.timeZone.offset;
-        if (tzStore.timeZone.name.HasValue())
+        lastTz.offset                                       = tzStore.timeZone.offset;
+        if (tzStore.timeZone.name.HasValue() && sizeof(name) >= sizeof(tzStore.name))
         {
             lastTz.name.SetValue(CharSpan(name));
             memcpy(name, tzStore.name, sizeof(tzStore.name));
@@ -702,20 +702,20 @@ CHIP_ERROR TimeSynchronizationServer::SetDSTOffset(const DataModel::DecodableLis
         if (!dstItem.validUntil.IsNull() && dstItem.validStarting >= dstItem.validUntil.Value())
         {
             ReturnErrorOnFailure(LoadDSTOffset());
-            return CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB;
+            return CHIP_IM_GLOBAL_STATUS(ConstraintError);
         }
         // validStarting shall not be smaller than validUntil of previous entry
         if (dstItem.validStarting < lastValidUntil)
         {
             ReturnErrorOnFailure(LoadDSTOffset());
-            return CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB;
+            return CHIP_IM_GLOBAL_STATUS(ConstraintError);
         }
         lastValidUntil = !dstItem.validUntil.IsNull() ? dstItem.validUntil.Value() : lastValidUntil;
         // only 1 validUntil null value and shall be last in the list
         if (dstItem.validUntil.IsNull() && (i != mDstOffsetObj.validSize - 1))
         {
             ReturnErrorOnFailure(LoadDSTOffset());
-            return CHIP_ERROR_IM_MALFORMED_COMMAND_DATA_IB;
+            return CHIP_IM_GLOBAL_STATUS(ConstraintError);
         }
     }
 
@@ -778,7 +778,7 @@ CHIP_ERROR TimeSynchronizationServer::SetUTCTime(EndpointId ep, uint64_t utcTime
         return err;
     }
     GetDelegate()->UTCTimeAvailabilityChanged(utcTime);
-    mGranularity  = granularity;
+    mGranularity  = static_cast<GranularityEnum>(to_underlying(granularity) - 1);
     Status status = TimeSource::Set(ep, source);
     if (!(status == Status::Success || status == Status::UnsupportedAttribute))
     {
@@ -932,7 +932,7 @@ TimeState TimeSynchronizationServer::UpdateDSTOffsetState()
         // current DST has expired
         // not using DST and next DST item in the list is not active yet
         dstList[activeDstIndex].offset = 0;
-        state = TimeState::kStopped;
+        state                          = TimeState::kStopped;
     }
     else
     {
@@ -1047,7 +1047,8 @@ CHIP_ERROR TimeSynchronizationAttrAccess::ReadDSTOffset(EndpointId endpoint, Att
 CHIP_ERROR TimeSynchronizationAttrAccess::ReadLocalTime(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
     DataModel::Nullable<uint64_t> localTime;
-    ReturnErrorOnFailure(TimeSynchronizationServer::Instance().GetLocalTime(endpoint, localTime));
+    VerifyOrReturnError(CHIP_NO_ERROR == TimeSynchronizationServer::Instance().GetLocalTime(endpoint, localTime),
+                        aEncoder.EncodeNull());
     ReturnErrorOnFailure(aEncoder.Encode(localTime));
     return CHIP_NO_ERROR;
 }
@@ -1131,8 +1132,7 @@ bool emberAfTimeSynchronizationClusterSetUTCTimeCallback(
         return true;
     }
 
-    if (granularity != GranularityEnum::kNoTimeGranularity &&
-        (currentGranularity == GranularityEnum::kNoTimeGranularity || granularity >= currentGranularity) &&
+    if (granularity > currentGranularity &&
         CHIP_NO_ERROR ==
             TimeSynchronizationServer::Instance().SetUTCTime(commandPath.mEndpointId, utcTime, granularity, TimeSourceEnum::kAdmin))
     {