Merge pull request rdkcentral#5804 from Dosakaya/release/7.9s23_BcomR…

…ogers

RDK-52180: Add ParentalControl new properties in Usersetttings.

.github/workflows/L2-tests-R4-4-1.yml

@@ -60,20 +60,31 @@ jobs:
             ninja -C build
             sudo ninja -C build install
 
+      - name: Checkout rdkservices
+        uses: actions/checkout@v3
+        with:
+          path: rdkservices
+
       - name: Checkout Thunder
         uses: actions/checkout@v3
         with:
           repository: rdkcentral/Thunder
           path: Thunder
           ref: ${{env.THUNDER_REF}}
 
+      - name: Apply patches Thunder
+        run: |
+          cd ${{github.workspace}}/Thunder
+          patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
+          cd -
+
       - name: Checkout ThunderTools
         if: steps.cache.outputs.cache-hit != 'true'
         uses: actions/checkout@v3
         with:
           repository: rdkcentral/ThunderTools
           path: ThunderTools
-          ref: ${{env.THUNDER_REF}}
+          ref: R4.4.3
 
       - name: Build ThunderTools
         if: steps.cache.outputs.cache-hit != 'true'
@@ -90,11 +101,6 @@ jobs:
           &&
           cmake --install build/ThunderTools
 
-      - name: Checkout rdkservices
-        uses: actions/checkout@v3
-        with:
-          path: rdkservices
-
       - name: Checkout rdkservices
         run: |
           cd ${{github.workspace}}/rdkservices
@@ -138,6 +144,7 @@ jobs:
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/0007-RDK-IDeviceInfo-Changes.patch
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/0001-RDK-45037-Secure-Storage-Thunder-Plugin.patch
               patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/RDKV-48604-User-Settings-Thunder-Plugin.patch
+              patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/Use_Legact_Alt_In_ThunderInterfaces_Based_On_ThunderTools_R4.4.3.patch
               cd ..
 
       - name: Build ThunderInterfaces

Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch

@@ -0,0 +1,20 @@
+commit 810aae64cb31c907698e468b615797750094b847
+Author: Pesala Lakshmi Jwala Priya <[email protected]>
+Date:   Thu Aug 29 12:31:30 2024 +0530
+
+    Alt change
+
+diff --git a/Source/plugins/CMakeLists.txt b/Source/plugins/CMakeLists.txt
+index 4d362d54..cdb53cdc 100644
+--- a/Source/plugins/CMakeLists.txt
++++ b/Source/plugins/CMakeLists.txt
+@@ -29,7 +29,7 @@ ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_S
+ ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/ISubSystem.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+ ProxyStubGenerator(NAMESPACE "WPEFramework::PluginHost" INPUT "${CMAKE_CURRENT_SOURCE_DIR}/IDispatcher.h" OUTDIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
+
+-JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES)
++JsonGenerator(CODE NAMESPACE WPEFramework::Exchange::Controller INPUT ${CMAKE_CURRENT_SOURCE_DIR}/IController.h OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated/jsonrpc" INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/.." NO_INCLUDES LEGACY_ALT)
+
+ add_library(${TARGET} SHARED
+         Channel.cpp
+

Tests/L2Tests/patches/Use_Legact_Alt_In_ThunderInterfaces_Based_On_ThunderTools_R4.4.3.patch

@@ -0,0 +1,22 @@
+commit f6fd38dcb9f2f1eaf5617119580957228231191c
+Author: Pesala Lakshmi Jwala Priya <[email protected]>
+Date:   Thu Aug 29 12:17:41 2024 +0530
+
+    R4.4.3_change
+
+diff --git a/definitions/CMakeLists.txt b/definitions/CMakeLists.txt
+index adacc7b..53c5327 100644
+--- a/definitions/CMakeLists.txt
++++ b/definitions/CMakeLists.txt
+@@ -49,8 +49,8 @@ if(NOT GENERATOR_SEARCH_PATH)
+     set(GENERATOR_SEARCH_PATH ${CMAKE_SYSROOT}${CMAKE_INSTALL_PREFIX}/include/${NAMESPACE})
+ endif()
+
+-JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/")
+-JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH})
++JsonGenerator(CODE INPUT ${JSON_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} CPPIFDIR "${CMAKE_CURRENT_SOURCE_DIR}/../interfaces/" LEGACY_ALT)
++JsonGenerator(CODE INPUT ${INTERFACE_FILE} OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/generated" INCLUDE_PATH ${GENERATOR_SEARCH_PATH} LEGACY_ALT)
+
+ file(GLOB JSON_ENUM_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/generated/JsonEnum*.cpp")
+ file(GLOB JSON_LINK_HEADERS "${CMAKE_CURRENT_BINARY_DIR}/generated/J*.h")
+

UserSettings/CHANGELOG.md

@@ -16,6 +16,18 @@ 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.2.0] - 2024-09-17
+### Added
+- Added ParentalControl new properties in Usersetttings.
+
+## [1.1.2] - 2024-08-26
+### Fixed
+- Updated api documentation according to interface.
+
+## [1.1.1] - 2024-07-08
+### Fixed
+- UserSettings Plugin missing default values updated.
+
 ## [1.1.0] - 2024-06-02
 ### Added
 - Added GetPrivacyMode/GetPrivacyMode calls.

UserSettings/UserSettings.h

@@ -80,10 +80,10 @@ namespace Plugin {
                     Exchange::JUserSettings::Event::OnPreferredAudioLanguagesChanged(_parent, preferredLanguages);
                 }
 
-                void OnPresentationLanguageChanged(const string& presentationLanguages) override
+                void OnPresentationLanguageChanged(const string& presentationLanguage) override
                 {
-                    LOGINFO("PresentationLanguageChanged: %s\n", presentationLanguages.c_str());
-                    Exchange::JUserSettings::Event::OnPresentationLanguageChanged(_parent, presentationLanguages);
+                    LOGINFO("PresentationLanguageChanged: %s\n", presentationLanguage.c_str());
+                    Exchange::JUserSettings::Event::OnPresentationLanguageChanged(_parent, presentationLanguage);
                 }
 
                 void OnCaptionsChanged(bool enabled) override
@@ -110,6 +110,48 @@ namespace Plugin {
                     Exchange::JUserSettings::Event::OnPrivacyModeChanged(_parent, privacyMode);
                 }
 
+                void OnPinControlChanged(const bool enabled) override
+                {
+                    LOGINFO("PinControlChanged: %d\n", enabled);
+                    Exchange::JUserSettings::Event::OnPinControlChanged(_parent, enabled);
+                }
+
+                void OnViewingRestrictionsChanged(const string& viewingRestrictions) override
+                {
+                    LOGINFO("ViewingRestrictionsChanged: %s\n", viewingRestrictions.c_str());
+                    Exchange::JUserSettings::Event::OnViewingRestrictionsChanged(_parent, viewingRestrictions);
+                }
+
+                void OnViewingRestrictionsWindowChanged(const string& viewingRestrictionsWindow) override
+                {
+                    LOGINFO("ViewingRestrictionsWindowChanged: %s\n", viewingRestrictionsWindow.c_str());
+                    Exchange::JUserSettings::Event::OnViewingRestrictionsWindowChanged(_parent, viewingRestrictionsWindow);
+                }
+
+                void OnLiveWatershedChanged(const bool enabled) override
+                {
+                    LOGINFO("LiveWatershedChanged: %d\n", enabled);
+                    Exchange::JUserSettings::Event::OnLiveWatershedChanged(_parent, enabled);
+                }
+
+                void OnPlaybackWatershedChanged(const bool enabled) override
+                {
+                    LOGINFO("PlaybackWatershedChanged: %d\n", enabled);
+                    Exchange::JUserSettings::Event::OnPlaybackWatershedChanged(_parent, enabled);
+                }
+
+                void OnBlockNotRatedContentChanged(const bool enabled) override
+                {
+                    LOGINFO("BlockNotRatedContentChanged: %d\n", enabled);
+                    Exchange::JUserSettings::Event::OnBlockNotRatedContentChanged(_parent, enabled);
+                }
+
+                void OnPinOnPurchaseChanged(const bool enabled) override
+                {
+                    LOGINFO("PinOnPurchaseChanged: %d\n", enabled);
+                    Exchange::JUserSettings::Event::OnPinOnPurchaseChanged(_parent, enabled);
+                }
+
             private:
                 UserSettings& _parent;
         };