RDKShell: Skip SetFocus to false for Suspended or Hibernated plugins

adrianM27 · Nov 16, 2023 · 24405f5 · 24405f5
1 parent cc2c93e
commit 24405f5
Showing 1 changed file with 49 additions and 6 deletions.
diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp
@@ -202,6 +202,9 @@ std::mutex nativeAppWasResumedMutex;
 map<string,bool> nativeAppWasResumed;
 #endif
 
+std::mutex suspendedOrHibernatedAppsMutex;
+map<string, bool> suspendedOrHibernatedApps;
+
 #define ANY_KEY 65536
 #define RDKSHELL_THUNDER_TIMEOUT 20000
 #define RDKSHELL_POWER_TIME_WAIT 2.5
@@ -611,6 +614,10 @@ namespace WPEFramework {
                mLaunchEnabled = false;
             }
 
+            suspendedOrHibernatedAppsMutex.lock();
+            suspendedOrHibernatedApps[mCallSign] = isSuspended;
+            suspendedOrHibernatedAppsMutex.unlock();
+
             if (isSuspended)
             {
                 JsonObject params;
@@ -1054,6 +1061,11 @@ namespace WPEFramework {
                 nativeAppWasResumed[service->Callsign()] = false;
                 nativeAppWasResumedMutex.unlock();
 #endif
+                //Reset app suspended/hibernated
+                suspendedOrHibernatedAppsMutex.lock();
+                suspendedOrHibernatedApps[service->Callsign()] = false;
+                suspendedOrHibernatedAppsMutex.unlock();
+
                 if(service->Reason() == PluginHost::IShell::FAILURE)
                 {
                     gApplicationsExitReason[service->Callsign()] = AppLastExitReason::CRASH;
@@ -1122,6 +1134,11 @@ namespace WPEFramework {
                     nativeAppWasResumed[service->Callsign()] = false;
                     nativeAppWasResumedMutex.unlock();
 #endif
+                    //Reset app suspended/hibernated
+                    suspendedOrHibernatedAppsMutex.lock();
+                    suspendedOrHibernatedApps[service->Callsign()] = false;
+                    suspendedOrHibernatedAppsMutex.unlock();
+
                 }
                 if(service->Reason() == PluginHost::IShell::FAILURE)
                 {
@@ -3850,6 +3867,12 @@ namespace WPEFramework {
                     }
                 }
 
+                //Reset app suspended/hibernated for launch
+                suspendedOrHibernatedAppsMutex.lock();
+                suspendedOrHibernatedApps[appCallsign] = false;
+                suspendedOrHibernatedAppsMutex.unlock();
+
+
                 //check to see if plugin already exists
                 bool newPluginFound = false;
                 bool originalPluginFound = false;
@@ -6605,14 +6628,34 @@ namespace WPEFramework {
                         std::string compositorName = toLower(previousFocusedIterator->first);
                         if (compositorName == previousFocusedClient)
                         {
-                            std::cout << "setting the focus of " << compositorName << " to false " << std::endl;
-                            Exchange::IFocus *focusedCallsign = mCurrentService->QueryInterfaceByCallsign<Exchange::IFocus>(previousFocusedIterator->first);
-                            if (focusedCallsign != NULL)
+#ifdef HIBERNATE_SUPPORT_ENABLED
+                            // Skip for suspended and hibernated apps, since not needed and may cause unwanted restore from hibernation
+                            bool skipFocus = false;
+                            suspendedOrHibernatedAppsMutex.lock();
+                            if (suspendedOrHibernatedApps.find(previousFocusedIterator->first) != suspendedOrHibernatedApps.end())
                             {
-                                uint32_t status = focusedCallsign->Focused(false);
-                                std::cout << "result of set focus to false: " << status << std::endl;
-                                focusedCallsign->Release();
+                                skipFocus = suspendedOrHibernatedApps[previousFocusedIterator->first];
                             }
+
+                            if (skipFocus == false)
+                            {
+#endif
+                                std::cout << "setting the focus of " << compositorName << " to false " << std::endl;
+                                Exchange::IFocus *focusedCallsign = mCurrentService->QueryInterfaceByCallsign<Exchange::IFocus>(previousFocusedIterator->first);
+                                if (focusedCallsign != NULL)
+                                {
+                                    uint32_t status = focusedCallsign->Focused(false);
+                                    std::cout << "result of set focus to false: " << status << std::endl;
+                                    focusedCallsign->Release();
+                                }
+#ifdef HIBERNATE_SUPPORT_ENABLED
+                             }
+                            else
+                            {
+                                std::cout << "setting the focus for " << compositorName << " to false skipped, plugin suspended or hibernated " << std::endl;
+                            }
+                            suspendedOrHibernatedAppsMutex.unlock();
+#endif
                             break;
                         }
                     }