From 980f6cdfdbecb414a2ca3efbe6dfda14b8ccb44b Mon Sep 17 00:00:00 2001 From: fzahir786 Date: Thu, 16 May 2024 06:51:21 +0000 Subject: [PATCH 1/2] RDKTV-28742: Activation of RA in RDKShell -To avoid launch of RA in factory mode Signed-off-by: Faizal Hasan.Z --- RDKShell/RDKShell.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp index 4a4fa3c22c..8316dfcf3b 100755 --- a/RDKShell/RDKShell.cpp +++ b/RDKShell/RDKShell.cpp @@ -1735,7 +1735,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(3500, "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) { From a52c6c8a4413cf05d61a468b2632f3994ec82a8c Mon Sep 17 00:00:00 2001 From: fzahir786 Date: Thu, 16 May 2024 14:15:24 +0000 Subject: [PATCH 2/2] RDKTV-28742: Activation of RA in RDKShell -To avoid launch of RA in factory mode Signed-off-by: Faizal Hasan.Z --- RDKShell/RDKShell.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RDKShell/RDKShell.cpp b/RDKShell/RDKShell.cpp index 8316dfcf3b..c4c196b5c4 100755 --- a/RDKShell/RDKShell.cpp +++ b/RDKShell/RDKShell.cpp @@ -1742,7 +1742,7 @@ namespace WPEFramework { activateParams.Set("callsign",callsign.c_str()); JsonObject activateResult; auto thunderController = getThunderControllerClient(); - status = thunderController->Invoke(3500, "activate", activateParams, activateResult); + status = thunderController->Invoke(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";