RDKEMW-8289 - CEC is not working after an FSR (#277)

* RDKEMW-8289 - CEC is not working after an FSR

Author: hgfell683

HdmiCecSource/HdmiCecSource.cpp

@@ -114,15 +114,7 @@ namespace WPEFramework
                 return ;
            }
 
-           bool enabled = false;
-           bool ret = false;
-           HdmiCecSource::_hdmiCecSource->GetEnabled(enabled,ret);
-
-           if(ret && enabled)
-           {
-                Exchange::IHdmiCecSource::HdmiCecSourceSuccess success;
-                HdmiCecSource::_hdmiCecSource->SetEnabled(false,success);
-           }
+           
            HdmiCecSource::_notification.OnActiveSourceStatusUpdated(false);
 
            if(nullptr != _hdmiCecSource)

HdmiCecSource/HdmiCecSourceImplementation.cpp

@@ -380,6 +380,12 @@ namespace WPEFramework
     HdmiCecSourceImplementation::~HdmiCecSourceImplementation()
     {
          LOGWARN("dtor");
+
+         if(cecEnableStatus)
+         {
+            setEnabledInternal(false, false);
+         }
+
          HdmiCecSourceImplementation::_instance = nullptr;
 
            if(_powerManagerPlugin)
@@ -933,7 +939,23 @@ namespace WPEFramework
         {
            LOGINFO("Entered SetEnabled ");
 
-           if (cecSettingEnabled != enabled)
+           Core:: hresult ret = setEnabledInternal(enabled, true);
+
+           if(ret == Core::ERROR_NONE)
+           {
+               success.success = true;
+           }
+           else
+           {
+               success.success = false;
+           }
+           return ret;
+        }
+
+        Core::hresult HdmiCecSourceImplementation::setEnabledInternal(const bool enabled, const bool isPersist)
+        {
+            LOGINFO("Entered setEnabledInternal enabled:%d isPersist:%d ",enabled,isPersist);
+           if (cecSettingEnabled != enabled && isPersist)
            {
                Utils::persistJsonSettings (CEC_SETTING_ENABLED_FILE, CEC_SETTING_ENABLED, JsonValue(enabled));
                cecSettingEnabled = enabled;
@@ -946,8 +968,8 @@ namespace WPEFramework
            {
                CECDisable();
            }
-           success.success = true;
            return Core::ERROR_NONE;
+
         }
 
         Core::hresult HdmiCecSourceImplementation::SetOTPEnabled(const bool &enabled, HdmiCecSourceSuccess &success)

HdmiCecSource/HdmiCecSourceImplementation.h

@@ -218,6 +218,7 @@ namespace WPEFramework {
             void sendUnencryptMsg(unsigned char* msg, int size);
             void sendDeviceUpdateInfo(const int logicalAddress);
 			void sendKeyReleaseEvent(const int logicalAddress);
+            Core::hresult setEnabledInternal(const bool enabled, const bool isPersist);
 		    typedef struct sendKeyInfo
                 {
                    int logicalAddr;
@@ -346,7 +347,6 @@ namespace WPEFramework {
             Core::hresult Register(Exchange::IHdmiCecSource::INotification *notification) override;
             Core::hresult Unregister(Exchange::IHdmiCecSource::INotification *notification) override;
 
-
         };
 	} // namespace Plugin
 } // namespace WPEFramework