diff --git a/RDKShell/CHANGELOG.md b/RDKShell/CHANGELOG.md index 1ee1a875bc..c620f9ce3f 100644 --- a/RDKShell/CHANGELOG.md +++ b/RDKShell/CHANGELOG.md @@ -16,6 +16,9 @@ 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. +## [1.5.3] - 2024-06-10 +### Changed +- ResidentApp plugin unable to activate due to unable to get the Initialize/activating Notification from Thunder(R4.4.1) ## [1.5.2] - 2024-06-04 ### Changed diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp index 0a419146db..2f22ab2592 100755 --- a/RDKShell/RDKShell.cpp +++ b/RDKShell/RDKShell.cpp @@ -1453,7 +1453,7 @@ namespace WPEFramework { } #ifdef USE_THUNDER_R4 - void RDKShell::MonitorClients::Initialize(VARIABLE_IS_NOT_USED const string& callsign, VARIABLE_IS_NOT_USED PluginHost::IShell* service) + void RDKShell::MonitorClients::Initialize(const string& callsign, PluginHost::IShell* service) { handleInitialize(service); } @@ -1470,10 +1470,10 @@ namespace WPEFramework { //StateChange(service); handleDeactivated(service); } - void RDKShell::MonitorClients::Deinitialized(VARIABLE_IS_NOT_USED const string& callsign, VARIABLE_IS_NOT_USED PluginHost::IShell* service) - { + void RDKShell::MonitorClients::Deinitialized(const string& callsign, PluginHost::IShell* service) + { handleDeinitialized(service); - } + } void RDKShell::MonitorClients::Unavailable(const string& callsign, PluginHost::IShell* service) {} #endif /* USE_THUNDER_R4 */ diff --git a/RDKShell/RDKShell.h b/RDKShell/RDKShell.h index dca3d9b054..63d2735d8c 100755 --- a/RDKShell/RDKShell.h +++ b/RDKShell/RDKShell.h @@ -396,7 +396,11 @@ namespace WPEFramework { RDKShell& mShell; }; - class MonitorClients : public PluginHost::IPlugin::INotification { + class MonitorClients : public PluginHost::IPlugin::INotification +#if ((THUNDER_VERSION >= 4) && (THUNDER_VERSION_MINOR >= 4)) + , public PluginHost::IPlugin::ILifeTime +#endif + { private: MonitorClients() = delete; MonitorClients(const MonitorClients&) = delete; @@ -414,6 +418,9 @@ namespace WPEFramework { public: BEGIN_INTERFACE_MAP(MonitorClients) INTERFACE_ENTRY(PluginHost::IPlugin::INotification) +#if ((THUNDER_VERSION >= 4) && (THUNDER_VERSION_MINOR >= 4)) + INTERFACE_ENTRY(PluginHost::IPlugin::ILifeTime) +#endif END_INTERFACE_MAP private: @@ -422,13 +429,14 @@ namespace WPEFramework { void handleActivated(PluginHost::IShell* shell); void handleDeactivated(PluginHost::IShell* shell); void handleDeinitialized(PluginHost::IShell* shell); + #ifdef USE_THUNDER_R4 - virtual void Initialize(VARIABLE_IS_NOT_USED const string& callsign, VARIABLE_IS_NOT_USED PluginHost::IShell* plugin); + virtual void Initialize(const string& callsign, PluginHost::IShell* plugin); virtual void Activation(const string& name, PluginHost::IShell* plugin); virtual void Deactivation(const string& name, PluginHost::IShell* plugin); virtual void Activated(const string& callSign, PluginHost::IShell* plugin); virtual void Deactivated(const string& callSign, PluginHost::IShell* plugin); - virtual void Deinitialized(VARIABLE_IS_NOT_USED const string& callsign, VARIABLE_IS_NOT_USED PluginHost::IShell* plugin); + virtual void Deinitialized(const string& callsign, PluginHost::IShell* plugin); virtual void Unavailable(const string& callSign, PluginHost::IShell* plugin); #endif /* USE_THUNDER_R4 */ private: