changes based on CI failures

project-chip · May 2, 2023 · ac2f0c9 · ac2f0c9
1 parent d31ca28
commit ac2f0c9
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 27 deletions.
diff --git a/src/app/clusters/time-synchronization-server/TimeSyncDataProvider.cpp b/src/app/clusters/time-synchronization-server/TimeSyncDataProvider.cpp
@@ -33,7 +33,6 @@ namespace chip {
 //   w.put(None, s)
 //   len(w.encoding)
 constexpr size_t kTrustedTimeSourceMaxSerializedSize = 23u + 9u;   // adding 9 as buffer
-constexpr size_t kDefaultNtpMaxSerializedSize        = 133u + 11u; // adding 11 as buffer
 constexpr size_t kTimeZoneMaxSerializedSize          = 90u + 6u;   // adding 6 as buffer
 constexpr size_t kDSTOffsetMaxSerializedSize         = 34u + 6u;   // adding 6 as buffer
 

diff --git a/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp b/src/app/clusters/time-synchronization-server/TimeSyncManager.cpp
@@ -16,14 +16,7 @@
  *    limitations under the License.
  */
 
-#include <app-common/zap-generated/cluster-objects.h>
-
 #include "TimeSyncManager.h"
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
-#include <list>
 
 using namespace chip::app::Clusters::TimeSynchronization;
 

diff --git a/src/app/clusters/time-synchronization-server/TimeSyncManager.h b/src/app/clusters/time-synchronization-server/TimeSyncManager.h
@@ -18,14 +18,7 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-objects.h>
-
 #include "time-synchronization-delegate.h"
-#include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
-#include <list>
 
 namespace chip {
 namespace app {

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h b/src/app/clusters/time-synchronization-server/time-synchronization-delegate.h
@@ -18,13 +18,7 @@
 
 #pragma once
 
-#include <app-common/zap-generated/cluster-objects.h>
-
 #include <app-common/zap-generated/attributes/Accessors.h>
-#include <app/AttributeAccessInterface.h>
-#include <app/CommandResponseHelper.h>
-#include <app/util/af.h>
-#include <list>
 
 namespace chip {
 namespace app {

diff --git a/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp b/src/app/clusters/time-synchronization-server/time-synchronization-server.cpp
@@ -143,7 +143,7 @@ CHIP_ERROR TimeSynchronizationServer::SetTimeZone(DataModel::DecodableList<TimeS
 {
     auto tzL    = mTimeZoneList.begin();
     auto newTzL = tz.begin();
-    size_t i    = 0;
+    uint8_t i   = 0;
 
     while (newTzL.Next() && i < CHIP_CONFIG_TIME_ZONE_LIST_MAX_SIZE)
     {
@@ -169,7 +169,7 @@ TimeSynchronizationServer::SetDSTOffset(DataModel::DecodableList<TimeSynchroniza
 {
     auto dstL    = mDstOffsetList.begin();
     auto newDstL = dst.begin();
-    size_t i     = 0;
+    uint8_t i    = 0;
 
     while (newDstL.Next() && i < CHIP_CONFIG_DST_OFFSET_LIST_MAX_SIZE)
     {
@@ -260,7 +260,7 @@ TimeSynchronizationAttrAccess gAttrAccess;
 
 CHIP_ERROR TimeSynchronizationAttrAccess::ReadTrustedTimeSource(EndpointId endpoint, AttributeValueEncoder & aEncoder)
 {
-    auto tts       = TimeSynchronizationServer::Instance().GetTrustedTimeSource();
+    auto tts = TimeSynchronizationServer::Instance().GetTrustedTimeSource();
     return aEncoder.Encode(tts);
 }
 
@@ -464,8 +464,6 @@ static bool utcTimeChanged(uint64_t utcTime)
     Server::GetInstance().GetFabricTable().GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpoch);
     System::SystemClock().GetClock_RealTime(realTime);
     chip::UnixEpochToChipEpochTime((uint32_t)(utcTime / chip::kMicrosecondsPerSecond), utcTimetoChipEpoch);
-    ChipLogProgress(Zcl, "UTC ChipEpoch Time: %u Last Known Good Time: %u Real Time: %llu", utcTimetoChipEpoch,
-                    lastKnownGoodChipEpoch.count(), realTime.count());
 
     VerifyOrReturnValue(Server::GetInstance().GetFabricTable().SetLastKnownGoodChipEpochTime(
                             System::Clock::Seconds32(utcTimetoChipEpoch)) == CHIP_NO_ERROR,
@@ -474,7 +472,6 @@ static bool utcTimeChanged(uint64_t utcTime)
 
     Server::GetInstance().GetFabricTable().GetLastKnownGoodChipEpochTime(lastKnownGoodChipEpoch);
     System::SystemClock().GetClock_RealTime(realTime);
-    ChipLogProgress(Zcl, " Last Known Good Time: %u Real Time: %llu", lastKnownGoodChipEpoch.count(), realTime.count());
     return true;
 }
 

diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn
@@ -176,6 +176,8 @@ if (current_os == "android" || build_java_matter_controller) {
       "jni/UnitTestingClient-InvokeSubscribeImpl.cpp",
       "jni/ClientMonitoringClient-ReadImpl.cpp",
       "jni/ClientMonitoringClient-InvokeSubscribeImpl.cpp",
+      "jni/TimeSynchronizationClient-ReadImpl.cpp",
+      "jni/TimeSynchronizationClient-InvokeSubscribeImpl.cpp",
     ]
 
     deps = [