Merge pull request #5822 from nanimatta/sprint/24Q4_1

RDKTV-33944, RDKTV-33967: Wpeframework hang after reboot
rdkcentral · Oct 29, 2024 · e68e530 · e68e530
2 parents c54344c + 787d242
commit e68e530
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 26 deletions.
diff --git a/RDKShell/CHANGELOG.md b/RDKShell/CHANGELOG.md
@@ -17,9 +17,6 @@ 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.6.4] - 2024-10-10
-### Fixed
-- Fix to activate RA after the Graphics subsystem
 
 ## [1.6.3] - 2024-09-09
 ### Added

diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp
@@ -53,7 +53,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 6
-#define API_VERSION_NUMBER_PATCH 4
+#define API_VERSION_NUMBER_PATCH 3
 
 const string WPEFramework::Plugin::RDKShell::SERVICE_NAME = "org.rdk.RDKShell";
 //methods
@@ -1929,6 +1929,24 @@ namespace WPEFramework {
             {
                 waitForPersistentStore = false;
             }
+            if(!factoryMacMatched){
+                   int32_t status = 0;
+                   std::string callsign("ResidentApp");
+                   JsonObject activateParams,response;
+                   activateParams.Set("callsign",callsign.c_str());
+                   JsonObject activateResult;
+                   auto thunderController = getThunderControllerClient();
+                   status = thunderController->Invoke<JsonObject, JsonObject>(RDKSHELL_THUNDER_TIMEOUT, "activate", activateParams, activateResult);
+                   std::cout << "Activating ResidentApp from RDKShell during bootup with Status:" << status << std::endl;
+                   if (status > 0){
+                           response["message"] = "resident app launch failed";
+                           std::cout << "resident app launch failed from rdkshell" << std::endl;
+                   }
+                  else {
+                        response["message"] = "resident app launch success";
+                        std::cout << "resident app launch success from rdkshell" << std::endl;
+                  }
+            }
 
             char* blockResidentApp = getenv("RDKSHELL_BLOCK_RESIDENTAPP_FACTORYMODE");
             if (NULL != blockResidentApp)
@@ -1979,17 +1997,7 @@ namespace WPEFramework {
                         }
                         else
                         {
-                            std::cout << "Launch RA not waiting for persistent store\n";
-                            gRdkShellMutex.unlock();
-                            int32_t status = 0;
-                            std::string callsign("ResidentApp");
-                            JsonObject activateParams;
-                            activateParams.Set("callsign",callsign.c_str());
-                            JsonObject activateResult;
-                            auto thunderController = getThunderControllerClient();
-                            status = thunderController->Invoke<JsonObject, JsonObject>(RDKSHELL_THUNDER_TIMEOUT, "activate", activateParams, activateResult);
-                            gRdkShellMutex.lock();
-                            std::cout << "Bootup Activating ResidentApp from RDKShell without Persistentstore wait with Status:" << status << std::endl;
+                            std::cout << "Not launching factory app as conditions not matched\n";
                         }
                     }
                 }
@@ -2051,17 +2059,7 @@ namespace WPEFramework {
                     }
                     else
                     {
-                        std::cout << "Launch RA after waiting for persistent store\n";
-                        gRdkShellMutex.unlock();
-                        int32_t status = 0;
-                        std::string callsign("ResidentApp");
-                        JsonObject activateParams;
-                        activateParams.Set("callsign",callsign.c_str());
-                        JsonObject activateResult;
-                        auto thunderController = getThunderControllerClient();
-                        status = thunderController->Invoke<JsonObject, JsonObject>(RDKSHELL_THUNDER_TIMEOUT, "activate", activateParams, activateResult);
-                        gRdkShellMutex.lock();
-                        std::cout << "Bootup Activating ResidentApp from RDKShell after Persistentstore wait with Status:" << status << std::endl;
+                        std::cout << "Not launching factory app as conditions not matched\n";
                     }
                   }
                   while (gCreateDisplayRequests.size() > 0)