Merge branch 'main' into main

adrianM27 · May 15, 2024 · 7b7e09e · 7b7e09e
2 parents 3e0443a + e73dcf8
commit 7b7e09e
Show file tree

Hide file tree

Showing 18 changed files with 670 additions and 8 deletions.
diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml
@@ -159,6 +159,7 @@ jobs:
           rdk/iarmmgrs-hal/pwrMgr.h
           rdk/iarmmgrs-hal/sysMgr.h
           rfcapi.h
+          rbus.h
           libudev.h
           systemservices/proc/readproc.h
           systemservices/secure_wrapper.h
@@ -212,6 +213,7 @@ jobs:
           -include ${{github.workspace}}/rdkservices/Tests/mocks/devicesettings.h
           -include ${{github.workspace}}/rdkservices/Tests/mocks/Iarm.h
           -include ${{github.workspace}}/rdkservices/Tests/mocks/Rfc.h
+          -include ${{github.workspace}}/rdkservices/Tests/mocks/RBus.h
           -include ${{github.workspace}}/rdkservices/Tests/mocks/Udev.h
           -include ${{github.workspace}}/rdkservices/Tests/mocks/Wraps.h
           -include ${{github.workspace}}/rdkservices/Tests/mocks/maintenanceMGR.h
@@ -226,6 +228,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_RFC=ON
           -DCMAKE_DISABLE_FIND_PACKAGE_RBus=ON
           -DPLUGIN_SYSTEMSERVICES=ON
+          -DPLUGIN_TELEMETRY=ON
           -DPLUGIN_HDCPPROFILE=ON
           -DPLUGIN_NETWORK=ON
           -DPLUGIN_TEXTTOSPEECH=ON

diff --git a/HdcpProfile/CHANGELOG.md b/HdcpProfile/CHANGELOG.md
@@ -16,6 +16,10 @@ 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.0.8] - 2024-05-06
+### Fixed
+- Fixed Handled Exception for DeviceSettings init
+
 ## [1.0.7] - 2024-03-29
 ### Security
 - Resolved security vulnerabilities

diff --git a/HdcpProfile/HdcpProfile.cpp b/HdcpProfile/HdcpProfile.cpp
@@ -43,7 +43,7 @@
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 7
+#define API_VERSION_NUMBER_PATCH 8
 
 namespace WPEFramework
 {
@@ -82,7 +82,15 @@ namespace WPEFramework
         {
             HdcpProfile::_instance = this;
             InitializeIARM();
-            device::Manager::Initialize();
+            try
+            {
+                device::Manager::Initialize();
+                LOGINFO("HdcpProfile device::Manager::Initialize success");
+            }
+            catch(...)
+            {
+                LOGINFO("HdcpProfile device::Manager::Initialize failed");
+            }
             return (string());
         }
 

diff --git a/HdmiCecSink/CHANGELOG.md b/HdmiCecSink/CHANGELOG.md
@@ -16,6 +16,10 @@ 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.3.7] - 2024-05-13
+### Fixed
+- Notify updateTextViewOn on receiving TextViewOn cec message.
+
 ## [1.3.6] - 2024-04-18
 ### Fixed
 - Send 'Give Audio status' request to the Audio device upon the volume +/- key press.

diff --git a/HdmiCecSink/HdmiCecSink.cpp b/HdmiCecSink/HdmiCecSink.cpp
@@ -177,7 +177,7 @@ static std::vector<DeviceFeatures> deviceFeatures = {DEVICE_FEATURES_TV};
 
 #define API_VERSION_NUMBER_MAJOR 1
 #define API_VERSION_NUMBER_MINOR 3
-#define API_VERSION_NUMBER_PATCH 6
+#define API_VERSION_NUMBER_PATCH 7
 
 namespace WPEFramework
 {
@@ -261,7 +261,7 @@ namespace WPEFramework
 		return;
 	     }
 			 HdmiCecSink::_instance->addDevice(header.from.toInt());
-			 HdmiCecSink::_instance->updateImageViewOn(header.from.toInt());
+			 HdmiCecSink::_instance->updateTextViewOn(header.from.toInt());
        }
        void HdmiCecSinkProcessor::process (const RequestActiveSource &msg, const Header &header)
        {

diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
@@ -15,6 +15,10 @@ All notable changes to this RDK Service will be documented in this file.
 * Changes in CHANGELOG should be updated when commits are added to the main or release branches. There should be one CHANGELOG entry per JIRA Ticket. This is not enforced on sprint branches since there could be multiple changes for the same JIRA ticket during development. 
 
 * For more details, refer to [versioning](https://github.com/rdkcentral/rdkservices#versioning) section under Main README.
+## [2.1.5] - 2024-05-14
+### Fixed
+- Fixed the autostart configurable from recipe
+
 ## [2.1.4] - 2024-05-02
 ### Fixed
 - Fixed the WPEFramework crash issue

diff --git a/SystemServices/CMakeLists.txt b/SystemServices/CMakeLists.txt
@@ -18,6 +18,7 @@
 set(PLUGIN_NAME SystemServices)
 set(MODULE_NAME ${NAMESPACE}${PLUGIN_NAME})
 
+set(PLUGIN_SYSTEM_AUTOSTART false CACHE STRING "To automatically start System plugin.")
 set(PLUGIN_SYSTEMSERVICE_STARTUPORDER "" CACHE STRING "To configure startup order of SystemServices plugin")
 
 find_package(${NAMESPACE}Plugins REQUIRED)

diff --git a/SystemServices/SystemServices.conf.in b/SystemServices/SystemServices.conf.in
@@ -1,4 +1,4 @@
 precondition = ["Platform"]
 callsign = "org.rdk.System"
-autostart = "false"
+autostart = "@PLUGIN_SYSTEM_AUTOSTART@"
 startuporder = "@PLUGIN_SYSTEMSERVICE_STARTUPORDER@"
diff --git a/SystemServices/SystemServices.config b/SystemServices/SystemServices.config
@@ -1,4 +1,4 @@
-set (autostart false)
+set (autostart ${PLUGIN_SYSTEM_AUTOSTART})
 set (preconditions Platform)
 set (callsign "org.rdk.System")
 

diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp
@@ -67,7 +67,7 @@ using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 2
 #define API_VERSION_NUMBER_MINOR 1
-#define API_VERSION_NUMBER_PATCH 4
+#define API_VERSION_NUMBER_PATCH 5
 
 #define MAX_REBOOT_DELAY 86400 /* 24Hr = 86400 sec */
 #define TR181_FW_DELAY_REBOOT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.fwDelayReboot"

diff --git a/Telemetry/CMakeLists.txt b/Telemetry/CMakeLists.txt
@@ -32,6 +32,16 @@ set_target_properties(${MODULE_NAME} PROPERTIES
         CXX_STANDARD 11
         CXX_STANDARD_REQUIRED YES)
 
+if (RDK_SERVICE_L2_TEST)
+   find_library(TESTMOCKLIB_LIBRARIES NAMES TestMocklib)
+   if (TESTMOCKLIB_LIBRARIES)
+       message ("linking mock libraries ${TESTMOCKLIB_LIBRARIES} library")
+       target_link_libraries(${MODULE_NAME} PRIVATE ${TESTMOCKLIB_LIBRARIES})
+   else (TESTMOCKLIB_LIBRARIES)
+       message ("Require ${TESTMOCKLIB_LIBRARIES} library")
+   endif (TESTMOCKLIB_LIBRARIES)
+endif (RDK_SERVICES_L2_TEST)
+
 list(APPEND CMAKE_MODULE_PATH
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
 

diff --git a/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt b/Tests/L2Tests/L2TestsPlugin/CMakeLists.txt
@@ -27,6 +27,7 @@ add_library(${MODULE_NAME} SHARED
     L2TestsMock.cpp
     tests/SystemService_L2Test.cpp
     tests/UsbAccess_L2Test.cpp
+    tests/Telemetry_L2Test.cpp
     tests/VerifyContracts.cpp)
 
 set_target_properties(${MODULE_NAME} PROPERTIES

diff --git a/Tests/L2Tests/L2TestsPlugin/L2TestsMock.cpp b/Tests/L2Tests/L2TestsPlugin/L2TestsMock.cpp
@@ -44,11 +44,15 @@ L2TestMocks::L2TestMocks()
     p_videoOutputPortConfigImplMock = new NiceMock <VideoOutputPortConfigImplMock>;
     p_managerImplMock   = new NiceMock <ManagerImplMock>;
     p_videoOutputPortMock = new NiceMock <VideoOutputPortMock>;
+    p_rBusApiImplMock   = new NiceMock <RBusApiImplMock>;
+    p_telemetryApiImplMock  = new NiceMock <TelemetryApiImplMock>;
 
     IarmBus::setImpl(p_iarmBusImplMock);
     RfcApi::setImpl(p_rfcApiImplMock);
     Udev::setImpl(p_udevImplMock);
     Wraps::setImpl(p_wrapsImplMock);
+    RBusApi::setImpl(p_rBusApiImplMock);
+    TelemetryApi::setImpl(p_telemetryApiImplMock);
     device::Host::setImpl(p_hostImplMock);
     device::VideoOutputPortConfig::setImpl(p_videoOutputPortConfigImplMock);
     device::Manager::setImpl(p_managerImplMock);
@@ -73,6 +77,19 @@ L2TestMocks::~L2TestMocks()
         delete p_rfcApiImplMock;
         p_rfcApiImplMock = nullptr;
    }
+   RBusApi::setImpl(nullptr);
+   if (p_rBusApiImplMock != nullptr)
+   {
+        delete p_rBusApiImplMock;
+        p_rBusApiImplMock = nullptr;
+   }
+
+   TelemetryApi::setImpl(nullptr);
+   if (p_telemetryApiImplMock != nullptr)
+   {
+        delete p_telemetryApiImplMock;
+        p_telemetryApiImplMock = nullptr;
+   }
    device::Host::setImpl(nullptr);
    if (p_hostImplMock != nullptr)
    {

diff --git a/Tests/L2Tests/L2TestsPlugin/L2TestsMock.h b/Tests/L2Tests/L2TestsPlugin/L2TestsMock.h
@@ -28,10 +28,13 @@
 #include "RfcApiMock.h"
 #include "UdevMock.h"
 #include "WrapsMock.h"
+#include "RBusMock.h"
+#include "TelemetryMock.h"
 #include "VideoOutputPortConfigMock.h"
 #include "VideoOutputPortMock.h"
 #include "HostMock.h"
 #include "ManagerMock.h"
+
 using ::testing::NiceMock;
 using namespace WPEFramework;
 
@@ -46,6 +49,8 @@ class L2TestMocks : public ::testing::Test {
         VideoOutputPortConfigImplMock *p_videoOutputPortConfigImplMock = nullptr ;
         ManagerImplMock  *p_managerImplMock = nullptr ;
         VideoOutputPortMock *p_videoOutputPortMock = nullptr;
+        RBusApiImplMock *p_rBusApiImplMock = nullptr;
+        TelemetryApiImplMock   *p_telemetryApiImplMock = nullptr ;
 
         std::string thunder_address;