Merge branch 'rdkcentral:sprint/25Q1' into feature/GetTVSupportedAPI_…

…InputParamCompliance
rdkcentral · Feb 5, 2025 · d9f084f · d9f084f
2 parents 065f9dc + 71d45c2
commit d9f084f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp
@@ -774,7 +774,7 @@ namespace WPEFramework
                     break;
                     case IARM_BUS_CECMGR_EVENT_STATUS_UPDATED:
                     {
-                        IARM_Bus_CECMgr_Status_Updated_Param_t *evtData = new IARM_Bus_CECMgr_Status_Updated_Param_t;
+                        IARM_Bus_CECMgr_Status_Updated_Param_t *evtData = (IARM_Bus_CECMgr_Status_Updated_Param_t *)data;
                         if(evtData)
                         {
                             std::thread worker(threadCecStatusUpdateHandler,evtData->logicalAddress);
@@ -863,6 +863,8 @@ namespace WPEFramework
                     {
                         logicalAddress = logicalAddr;
                         logicalAddressDeviceType = logicalAddrDeviceType;
+                        if(smConnection)
+                            smConnection->setSource(logicalAddress); // update initiator LA
                     }
                 }
                 catch (const std::exception& e)

diff --git a/Monitor/CHANGELOG.md b/Monitor/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this RDK Service will be documented in this file.
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
 
+## [2.0.1] - 2025-02-04
+### Changed
+- Bring back the Delay changes in Thread Restart Logic
+
 ## [2.0.0] - 2024-12-12
 ### Changed
 - Synced Monitor Plugin with WebPlatformForEmbedded/ThunderNanoServicesRDK/tree/R4_4/Monitor

diff --git a/Monitor/Monitor.cpp b/Monitor/Monitor.cpp
@@ -21,7 +21,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 2
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 0
+#define API_VERSION_NUMBER_PATCH 1
 
 namespace WPEFramework {
 namespace Plugin {
@@ -163,4 +163,4 @@ namespace Plugin {
         return (result);
     }
 }
-}
+}
diff --git a/Monitor/Monitor.h b/Monitor/Monitor.h
@@ -787,7 +787,7 @@ POP_WARNING()
                             _service->Notify(message);
                             _parent.event_action(callsign, "Activate", "Automatic");
                             TRACE(Trace::Error, (_T("Restarting %s again because we detected it misbehaved."), callsign.c_str()));
-                            Core::IWorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(service, PluginHost::IShell::ACTIVATED, PluginHost::IShell::AUTOMATIC));
+                            Core::IWorkerPool::Instance().Schedule(Core::Time::Now().Add(5000), PluginHost::IShell::Job::Create(service, PluginHost::IShell::ACTIVATED, PluginHost::IShell::AUTOMATIC));
                         }
                     } 
                 }
@@ -1049,4 +1049,4 @@ POP_WARNING()
 }
 }
 
-#endif // __MONITOR_H
+#endif // __MONITOR_H