RDK-55887: Update the Plugin Client with QueryInterface with CallSign

KaleeswaranGnanagurusamy · KaleeswaranGnanagurusamy · commit d519935e1b9f · 2025-02-21T14:40:00.000+05:30
diff --git a/HdcpProfile/HdcpProfile.cpp b/HdcpProfile/HdcpProfile.cpp
@@ -77,20 +77,18 @@ namespace WPEFramework
         : PluginHost::JSONRPC()
         {
             RegisterAll();
-            _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();
-            _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));
         }
 
         HdcpProfile::~HdcpProfile()
         {
             UnregisterAll();
         }
 
-        const string HdcpProfile::Initialize(PluginHost::IShell * /* service */)
+        const string HdcpProfile::Initialize(PluginHost::IShell *service)
         {
             HdcpProfile::_instance = this;
             InitializeIARM();
-            InitializePowerManager();
+            InitializePowerManager(service);
             try
             {
                 device::Manager::Initialize();
@@ -109,27 +107,16 @@ namespace WPEFramework
                 _powerManagerPlugin.Reset();
             }
 
-            LOGINFO("Disconnect from the COM-RPC socket\n");
-
-            // Disconnect from the COM-RPC socket
-            if (_communicatorClient.IsValid()) {
-                _communicatorClient->Close(RPC::CommunicationTimeOut);
-                _communicatorClient.Release();
-            }
-            if (_engine.IsValid()) {
-                _engine.Release();
-            }
             HdcpProfile::_instance = nullptr;
             // No need to run device::Manager::DeInitialize for individual plugin. As it is a singleton instance
             // and shared among all wpeframework plugins
             DeinitializeIARM();
         }
 
-        void HdcpProfile::InitializePowerManager()
+        void HdcpProfile::InitializePowerManager(PluginHost::IShell *service)
         {
-            _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))
-                                    .withTimeout(3000)
-                                    .withVersion(~0)
+            _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
+                                    .withIShell(service)
                                     .createInterface();
         }
 
diff --git a/HdcpProfile/HdcpProfile.h b/HdcpProfile/HdcpProfile.h
@@ -46,16 +46,14 @@ namespace WPEFramework {
             // We do not allow this plugin to be copied !!
             HdcpProfile(const HdcpProfile&) = delete;
             HdcpProfile& operator=(const HdcpProfile&) = delete;
-            Core::ProxyType<RPC::InvokeServerType<1, 0, 4> > _engine;
-            Core::ProxyType<RPC::CommunicatorClient> _communicatorClient;
             static PowerManagerInterfaceRef _powerManagerPlugin;
 
             void InitializeIARM();
             void DeinitializeIARM();
 
             void RegisterAll();
             void UnregisterAll();
-            void InitializePowerManager();
+            void InitializePowerManager(PluginHost::IShell * service);
 
             //Begin methods
             uint32_t getHDCPStatusWrapper(const JsonObject& parameters, JsonObject& response);
diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp
@@ -687,16 +687,14 @@ namespace WPEFramework
         , _registeredEventHandlers(false)
        {
            LOGWARN("Initlaizing HdmiCecSink");
-           _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();
-           _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));
        }
 
        HdmiCecSink::~HdmiCecSink()
        {
        }
-       const std::string HdmiCecSink::Initialize(PluginHost::IShell * /* service */)
+       const std::string HdmiCecSink::Initialize(PluginHost::IShell *service)
        {
-            InitializePowerManager();
+            InitializePowerManager(service);
 		   profileType = searchRdkProfile();
 
 		   if (profileType == STB || profileType == NOT_FOUND)
@@ -826,17 +824,6 @@ namespace WPEFramework
            {
                _powerManagerPlugin.Reset();
            }
-           LOGINFO("Disconnect from the COM-RPC socket\n");
-           // Disconnect from the COM-RPC socket
-           if (_communicatorClient.IsValid())
-           {
-               _communicatorClient->Close(RPC::CommunicationTimeOut);
-               _communicatorClient.Release();
-           }
-           if(_engine.IsValid())
-           {
-               _engine.Release();
-           }
            _registeredEventHandlers = false;
 
 		profileType = searchRdkProfile();
@@ -910,11 +897,10 @@ namespace WPEFramework
             }
        }
 
-        void HdmiCecSink::InitializePowerManager()
+        void HdmiCecSink::InitializePowerManager(PluginHost::IShell *service)
         {
-            _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))
-                                    .withTimeout(3000)
-                                    .withVersion(~0)
+            _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
+                                    .withIShell(service)
                                     .createInterface();
             registerEventHandlers();
         }
diff --git a/HdmiCecSink/HdmiCecSink.h b/HdmiCecSink/HdmiCecSink.h
@@ -646,7 +646,7 @@ namespace WPEFramework {
 			uint32_t getAudioDeviceConnectedStatusWrapper(const JsonObject& parameters, JsonObject& response);
                         uint32_t requestAudioDevicePowerStatusWrapper(const JsonObject& parameters, JsonObject& response);
                         uint32_t setLatencyInfoWrapper(const JsonObject& parameters, JsonObject& response);
-            void InitializePowerManager();
+            void InitializePowerManager(PluginHost::IShell *service);
 			//End methods
             std::string logicalAddressDeviceType;
             bool cecSettingEnabled;
@@ -690,8 +690,6 @@ namespace WPEFramework {
 			std::vector<uint8_t> m_connectedDevices;
             HdmiCecSinkProcessor *msgProcessor;
             HdmiCecSinkFrameListener *msgFrameListener;
-            Core::ProxyType<RPC::InvokeServerType<1, 0, 4> > _engine;
-            Core::ProxyType<RPC::CommunicatorClient> _communicatorClient;
             PowerManagerInterfaceRef _powerManagerPlugin;
             Core::Sink<PowerManagerNotification> _pwrMgrNotification;
             bool _registeredEventHandlers;
diff --git a/HdmiCecSource/HdmiCecSource.cpp b/HdmiCecSource/HdmiCecSource.cpp
@@ -404,16 +404,14 @@ namespace WPEFramework
        , _registeredEventHandlers(false)
        {
            LOGWARN("ctor");
-           _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();
-           _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));
        }
 
        HdmiCecSource::~HdmiCecSource()
        {
            LOGWARN("dtor");
        }
 
-       const string HdmiCecSource::Initialize(PluginHost::IShell* /* service */)
+       const string HdmiCecSource::Initialize(PluginHost::IShell *service)
        {
            LOGWARN("Initlaizing CEC_2");
            uint32_t res = Core::ERROR_GENERAL;
@@ -456,7 +454,7 @@ namespace WPEFramework
 
                //CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly.
                InitializeIARM();
-               InitializePowerManager();
+               InitializePowerManager(service);
 
                // load persistence setting
                loadSettings();
@@ -539,17 +537,6 @@ namespace WPEFramework
            {
                _powerManagerPlugin.Reset();
            }
-           LOGINFO("Disconnect from the COM-RPC socket\n");
-           // Disconnect from the COM-RPC socket
-           if (_communicatorClient.IsValid())
-           {
-               _communicatorClient->Close(RPC::CommunicationTimeOut);
-               _communicatorClient.Release();
-           }
-           if(_engine.IsValid())
-           {
-               _engine.Release();
-           }
            _registeredEventHandlers = false;
 
            profileType = searchRdkProfile();
@@ -729,12 +716,11 @@ namespace WPEFramework
 	    return ret;
        }
 
-        void HdmiCecSource::InitializePowerManager()
+        void HdmiCecSource::InitializePowerManager(PluginHost::IShell *service)
         {
             LOGINFO("Connect the COM-RPC socket\n");
-            _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))
-                                    .withTimeout(3000)
-                                    .withVersion(~0)
+            _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
+                                    .withIShell(service)
                                     .createInterface();
             registerEventHandlers();
         }
diff --git a/HdmiCecSource/HdmiCecSource.h b/HdmiCecSource/HdmiCecSource.h
@@ -297,7 +297,7 @@ namespace WPEFramework {
 		
             HdmiCecSourceProcessor *msgProcessor;
             HdmiCecSourceFrameListener *msgFrameListener;
-            void InitializePowerManager();
+            void InitializePowerManager(PluginHost::IShell *service);
             const void InitializeIARM();
             void DeinitializeIARM();
             static void dsHdmiEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
@@ -329,8 +329,6 @@ namespace WPEFramework {
             static void threadHotPlugEventHandler(int data);
             static void threadCecDaemonInitHandler();
             static void threadCecStatusUpdateHandler(int data);
-            Core::ProxyType<RPC::InvokeServerType<1, 0, 4> > _engine;
-            Core::ProxyType<RPC::CommunicatorClient> _communicatorClient;
             PowerManagerInterfaceRef _powerManagerPlugin;
             Core::Sink<PowerManagerNotification> _pwrMgrNotification;
             bool _registeredEventHandlers;
diff --git a/HdmiCec_2/HdmiCec_2.cpp b/HdmiCec_2/HdmiCec_2.cpp
@@ -405,8 +405,6 @@ namespace WPEFramework
            Register(HDMICEC2_METHOD_GET_ACTIVE_SOURCE_STATUS, &HdmiCec_2::getActiveSourceStatus, this);
            Register(HDMICEC2_METHOD_SEND_KEY_PRESS,&HdmiCec_2::sendRemoteKeyPressWrapper,this);
            Register("getDeviceList", &HdmiCec_2::getDeviceList, this);
-           _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();
-           _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));
        }
 
        HdmiCec_2::~HdmiCec_2()
@@ -415,7 +413,7 @@ namespace WPEFramework
            LOGWARN("dtor");
        }
  
-       const string HdmiCec_2::Initialize(PluginHost::IShell* /* service */)
+       const string HdmiCec_2::Initialize(PluginHost::IShell* service)
        {
            LOGWARN("Initlaizing CEC_2");
            string msg;
@@ -448,7 +446,7 @@ namespace WPEFramework
 
                //CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly.
                InitializeIARM();
-               InitializePowerManager();
+               InitializePowerManager(service);
 
                // load persistence setting
                loadSettings();
@@ -520,17 +518,6 @@ namespace WPEFramework
            {
                _powerManagerPlugin.Reset();
            }
-           LOGINFO("Disconnect from the COM-RPC socket\n");
-           // Disconnect from the COM-RPC socket
-           if (_communicatorClient.IsValid())
-           {
-               _communicatorClient->Close(RPC::CommunicationTimeOut);
-               _communicatorClient.Release();
-           }
-           if(_engine.IsValid())
-           {
-               _engine.Release();
-           }
            _registeredEventHandlers = false;
            if(true == getEnabled())
            {
@@ -554,12 +541,11 @@ namespace WPEFramework
             }
         }
 
-        void HdmiCec_2::InitializePowerManager()
+        void HdmiCec_2::InitializePowerManager(PluginHost::IShell* service)
         {
             LOGINFO("Connect the COM-RPC socket\n");
-            _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))
-                                    .withTimeout(3000)
-                                    .withVersion(~0)
+            _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))
+                                    .withIShell(service)
                                     .createInterface();
             registerEventHandlers();
         }
diff --git a/HdmiCec_2/HdmiCec_2.h b/HdmiCec_2/HdmiCec_2.h
@@ -294,12 +294,10 @@ namespace WPEFramework {
 		
             HdmiCec_2Processor *msgProcessor;
             HdmiCec_2FrameListener *msgFrameListener;
-            Core::ProxyType<RPC::InvokeServerType<1, 0, 4> > _engine;
-            Core::ProxyType<RPC::CommunicatorClient> _communicatorClient;
             PowerManagerInterfaceRef _powerManagerPlugin;
             Core::Sink<PowerManagerNotification> _pwrMgrNotification;
             bool _registeredEventHandlers;
-            void InitializePowerManager();
+            void InitializePowerManagerPluginHost::IShell *service
             const void InitializeIARM();
             void DeinitializeIARM();
             static void cecMgrEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len);
diff --git a/helpers/PluginInterfaceBuilder.h b/helpers/PluginInterfaceBuilder.h
diff --git a/helpers/frontpanel.cpp b/helpers/frontpanel.cpp
diff --git a/helpers/frontpanel.h b/helpers/frontpanel.h

Original file line number	Diff line number	Diff line change
`@@ -77,20 +77,18 @@ namespace WPEFramework`
`77`	`77`	`: PluginHost::JSONRPC()`
`78`	`78`	`{`
`79`	`79`	`RegisterAll();`
`80`		`- _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();`
`81`		`- _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));`
`82`	`80`	`}`
`83`	`81`
`84`	`82`	`HdcpProfile::~HdcpProfile()`
`85`	`83`	`{`
`86`	`84`	`UnregisterAll();`
`87`	`85`	`}`
`88`	`86`
`89`		`- const string HdcpProfile::Initialize(PluginHost::IShell * /* service */)`
	`87`	`+ const string HdcpProfile::Initialize(PluginHost::IShell *service)`
`90`	`88`	`{`
`91`	`89`	`HdcpProfile::_instance = this;`
`92`	`90`	`InitializeIARM();`
`93`		`- InitializePowerManager();`
	`91`	`+ InitializePowerManager(service);`
`94`	`92`	`try`
`95`	`93`	`{`
`96`	`94`	`device::Manager::Initialize();`
`@@ -109,27 +107,16 @@ namespace WPEFramework`
`109`	`107`	`_powerManagerPlugin.Reset();`
`110`	`108`	`}`
`111`	`109`
`112`		`- LOGINFO("Disconnect from the COM-RPC socket\n");`
`113`		`-`
`114`		`- // Disconnect from the COM-RPC socket`
`115`		`- if (_communicatorClient.IsValid()) {`
`116`		`- _communicatorClient->Close(RPC::CommunicationTimeOut);`
`117`		`- _communicatorClient.Release();`
`118`		`- }`
`119`		`- if (_engine.IsValid()) {`
`120`		`- _engine.Release();`
`121`		`- }`
`122`	`110`	`HdcpProfile::_instance = nullptr;`
`123`	`111`	`// No need to run device::Manager::DeInitialize for individual plugin. As it is a singleton instance`
`124`	`112`	`// and shared among all wpeframework plugins`
`125`	`113`	`DeinitializeIARM();`
`126`	`114`	`}`
`127`	`115`
`128`		`- void HdcpProfile::InitializePowerManager()`
	`116`	`+ void HdcpProfile::InitializePowerManager(PluginHost::IShell *service)`
`129`	`117`	`{`
`130`		`- _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))`
`131`		`- .withTimeout(3000)`
`132`		`- .withVersion(~0)`
	`118`	`+ _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
	`119`	`+ .withIShell(service)`
`133`	`120`	`.createInterface();`
`134`	`121`	`}`
`135`	`122`
Original file line number	Diff line number	Diff line change
`@@ -687,16 +687,14 @@ namespace WPEFramework`
`687`	`687`	`, _registeredEventHandlers(false)`
`688`	`688`	`{`
`689`	`689`	`LOGWARN("Initlaizing HdmiCecSink");`
`690`		`- _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();`
`691`		`- _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));`
`692`	`690`	`}`
`693`	`691`
`694`	`692`	`HdmiCecSink::~HdmiCecSink()`
`695`	`693`	`{`
`696`	`694`	`}`
`697`		`- const std::string HdmiCecSink::Initialize(PluginHost::IShell * /* service */)`
	`695`	`+ const std::string HdmiCecSink::Initialize(PluginHost::IShell *service)`
`698`	`696`	`{`
`699`		`- InitializePowerManager();`
	`697`	`+ InitializePowerManager(service);`
`700`	`698`	`profileType = searchRdkProfile();`
`701`	`699`
`702`	`700`	`if (profileType == STB \|\| profileType == NOT_FOUND)`
`@@ -826,17 +824,6 @@ namespace WPEFramework`
`826`	`824`	`{`
`827`	`825`	`_powerManagerPlugin.Reset();`
`828`	`826`	`}`
`829`		`- LOGINFO("Disconnect from the COM-RPC socket\n");`
`830`		`- // Disconnect from the COM-RPC socket`
`831`		`- if (_communicatorClient.IsValid())`
`832`		`- {`
`833`		`- _communicatorClient->Close(RPC::CommunicationTimeOut);`
`834`		`- _communicatorClient.Release();`
`835`		`- }`
`836`		`- if(_engine.IsValid())`
`837`		`- {`
`838`		`- _engine.Release();`
`839`		`- }`
`840`	`827`	`_registeredEventHandlers = false;`
`841`	`828`
`842`	`829`	`profileType = searchRdkProfile();`
`@@ -910,11 +897,10 @@ namespace WPEFramework`
`910`	`897`	`}`
`911`	`898`	`}`
`912`	`899`
`913`		`- void HdmiCecSink::InitializePowerManager()`
	`900`	`+ void HdmiCecSink::InitializePowerManager(PluginHost::IShell *service)`
`914`	`901`	`{`
`915`		`- _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))`
`916`		`- .withTimeout(3000)`
`917`		`- .withVersion(~0)`
	`902`	`+ _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
	`903`	`+ .withIShell(service)`
`918`	`904`	`.createInterface();`
`919`	`905`	`registerEventHandlers();`
`920`	`906`	`}`
Original file line number	Diff line number	Diff line change
`@@ -404,16 +404,14 @@ namespace WPEFramework`
`404`	`404`	`, _registeredEventHandlers(false)`
`405`	`405`	`{`
`406`	`406`	`LOGWARN("ctor");`
`407`		`- _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();`
`408`		`- _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));`
`409`	`407`	`}`
`410`	`408`
`411`	`409`	`HdmiCecSource::~HdmiCecSource()`
`412`	`410`	`{`
`413`	`411`	`LOGWARN("dtor");`
`414`	`412`	`}`
`415`	`413`
`416`		`- const string HdmiCecSource::Initialize(PluginHost::IShell* /* service */)`
	`414`	`+ const string HdmiCecSource::Initialize(PluginHost::IShell *service)`
`417`	`415`	`{`
`418`	`416`	`LOGWARN("Initlaizing CEC_2");`
`419`	`417`	`uint32_t res = Core::ERROR_GENERAL;`
`@@ -456,7 +454,7 @@ namespace WPEFramework`
`456`	`454`
`457`	`455`	`//CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly.`
`458`	`456`	`InitializeIARM();`
`459`		`- InitializePowerManager();`
	`457`	`+ InitializePowerManager(service);`
`460`	`458`
`461`	`459`	`// load persistence setting`
`462`	`460`	`loadSettings();`
`@@ -539,17 +537,6 @@ namespace WPEFramework`
`539`	`537`	`{`
`540`	`538`	`_powerManagerPlugin.Reset();`
`541`	`539`	`}`
`542`		`- LOGINFO("Disconnect from the COM-RPC socket\n");`
`543`		`- // Disconnect from the COM-RPC socket`
`544`		`- if (_communicatorClient.IsValid())`
`545`		`- {`
`546`		`- _communicatorClient->Close(RPC::CommunicationTimeOut);`
`547`		`- _communicatorClient.Release();`
`548`		`- }`
`549`		`- if(_engine.IsValid())`
`550`		`- {`
`551`		`- _engine.Release();`
`552`		`- }`
`553`	`540`	`_registeredEventHandlers = false;`
`554`	`541`
`555`	`542`	`profileType = searchRdkProfile();`
`@@ -729,12 +716,11 @@ namespace WPEFramework`
`729`	`716`	`return ret;`
`730`	`717`	`}`
`731`	`718`
`732`		`- void HdmiCecSource::InitializePowerManager()`
	`719`	`+ void HdmiCecSource::InitializePowerManager(PluginHost::IShell *service)`
`733`	`720`	`{`
`734`	`721`	`LOGINFO("Connect the COM-RPC socket\n");`
`735`		`- _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))`
`736`		`- .withTimeout(3000)`
`737`		`- .withVersion(~0)`
	`722`	`+ _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
	`723`	`+ .withIShell(service)`
`738`	`724`	`.createInterface();`
`739`	`725`	`registerEventHandlers();`
`740`	`726`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,6 @@ namespace WPEFramework`
`405`	`405`	`Register(HDMICEC2_METHOD_GET_ACTIVE_SOURCE_STATUS, &HdmiCec_2::getActiveSourceStatus, this);`
`406`	`406`	`Register(HDMICEC2_METHOD_SEND_KEY_PRESS,&HdmiCec_2::sendRemoteKeyPressWrapper,this);`
`407`	`407`	`Register("getDeviceList", &HdmiCec_2::getDeviceList, this);`
`408`		`- _engine = Core::ProxyType<RPC::InvokeServerType<1, 0, 4>>::Create();`
`409`		`- _communicatorClient = Core::ProxyType<RPC::CommunicatorClient>::Create(Core::NodeId("/tmp/communicator"), Core::ProxyType<Core::IIPCServer>(_engine));`
`410`	`408`	`}`
`411`	`409`
`412`	`410`	`HdmiCec_2::~HdmiCec_2()`
`@@ -415,7 +413,7 @@ namespace WPEFramework`
`415`	`413`	`LOGWARN("dtor");`
`416`	`414`	`}`
`417`	`415`
`418`		`- const string HdmiCec_2::Initialize(PluginHost::IShell* /* service */)`
	`416`	`+ const string HdmiCec_2::Initialize(PluginHost::IShell* service)`
`419`	`417`	`{`
`420`	`418`	`LOGWARN("Initlaizing CEC_2");`
`421`	`419`	`string msg;`
`@@ -448,7 +446,7 @@ namespace WPEFramework`
`448`	`446`
`449`	`447`	`//CEC plugin functionalities will only work if CECmgr is available. If plugin Initialize failure upper layer will call dtor directly.`
`450`	`448`	`InitializeIARM();`
`451`		`- InitializePowerManager();`
	`449`	`+ InitializePowerManager(service);`
`452`	`450`
`453`	`451`	`// load persistence setting`
`454`	`452`	`loadSettings();`
`@@ -520,17 +518,6 @@ namespace WPEFramework`
`520`	`518`	`{`
`521`	`519`	`_powerManagerPlugin.Reset();`
`522`	`520`	`}`
`523`		`- LOGINFO("Disconnect from the COM-RPC socket\n");`
`524`		`- // Disconnect from the COM-RPC socket`
`525`		`- if (_communicatorClient.IsValid())`
`526`		`- {`
`527`		`- _communicatorClient->Close(RPC::CommunicationTimeOut);`
`528`		`- _communicatorClient.Release();`
`529`		`- }`
`530`		`- if(_engine.IsValid())`
`531`		`- {`
`532`		`- _engine.Release();`
`533`		`- }`
`534`	`521`	`_registeredEventHandlers = false;`
`535`	`522`	`if(true == getEnabled())`
`536`	`523`	`{`
`@@ -554,12 +541,11 @@ namespace WPEFramework`
`554`	`541`	`}`
`555`	`542`	`}`
`556`	`543`
`557`		`- void HdmiCec_2::InitializePowerManager()`
	`544`	`+ void HdmiCec_2::InitializePowerManager(PluginHost::IShell* service)`
`558`	`545`	`{`
`559`	`546`	`LOGINFO("Connect the COM-RPC socket\n");`
`560`		`- _powerManagerPlugin = PowerManagerInterfaceBuilder(_communicatorClient, _T("org.rdk.PowerManager"))`
`561`		`- .withTimeout(3000)`
`562`		`- .withVersion(~0)`
	`547`	`+ _powerManagerPlugin = PowerManagerInterfaceBuilder(_T("org.rdk.PowerManager"))`
	`548`	`+ .withIShell(service)`
`563`	`549`	`.createInterface();`
`564`	`550`	`registerEventHandlers();`
`565`	`551`	`}`