Merge pull request #5680 from rwarier/sprint/24Q3

RDKTV-32671 wait for graphics subsystem before RA is activated
rdkcentral · Sep 6, 2024 · 804af93 · 804af93
2 parents b146f9d + e26fa71
commit 804af93
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp
@@ -1983,13 +1983,15 @@ namespace WPEFramework {
                         {
                           std::cout << "not launching factory app as conditions not matched\n";
                           std::cout << "Launch RA not waiting for persistent store\n";
-			  int32_t status = 0;
-			  std::string callsign("ResidentApp");
+                          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);
+                          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;
                         }
                     }
@@ -2053,14 +2055,16 @@ namespace WPEFramework {
                     else
                     {
                         std::cout << "Not launching factory app as conditions not matched\n";
-			std::cout << "Launch RA after waiting for persistent store\n";
+                        std::cout << "Launch RA after waiting for persistent store\n";
                         int32_t status = 0;
-			std::string callsign("ResidentApp");
+                        gRdkShellMutex.unlock();
+                        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);
+                        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;
                     }
                   }