Merge branch 'main' into feature/set_dimming_mode_fails_main

Author: ddevad

.github/workflows/L1-tests.yml

@@ -275,7 +275,7 @@ jobs:
           -DPLUGIN_SCREENCAPTURE=ON
           -DPLUGIN_USBACCESS=ON
           -DPLUGIN_LOGGINGPREFERENCES=ON
-          -DPLUGIN_USERPREFERENCES=ON
+          -DPLUGIN_USERPREFERENCES=OFF
           -DPLUGIN_MESSENGER=ON
           -DPLUGIN_DEVICEINFO=ON
           -DPLUGIN_SYSTEMSERVICES=ON

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

@@ -274,6 +274,7 @@ jobs:
           -DPLUGIN_USBACCESS=ON
           -DPLUGIN_USERSETTINGS=ON
           -DPLUGIN_PERSISTENTSTORE=ON
+          -DPLUGIN_USERPREFERENCES=ON
           -DUSE_THUNDER_R4=ON
           -DPLUGIN_L2Tests=ON
           -DRDK_SERVICE_L2_TEST=ON
@@ -314,6 +315,7 @@ jobs:
           /opt/tmtryoptout
           /opt/fwdnldstatus.txt
           /opt/dcm.properties
+          /opt/user_preferences.conf
           /etc/device.properties
           /etc/dcm.properties
           /etc/authService.conf

AVOutput/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.1.2] - 2025-05-14
+### Fixed
+- Set backlight dimming mode failure
+
 ## [1.1.1] - 2025-05-02
 ### Added
 - ODM API removal changes phase 2

ContentProtection/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.1.0] - 2025-05-13
+### Changed
+- New appId parameter in openDrmSession and onWatermarkStatusChanged, opacityLevel parameter in showWatermark
+
 ## [1.0.1] - 2025-05-05
 ### Fixed
 - Fix callsign - "org.rdk." missing

ContentProtection/ContentProtection.cpp

@@ -20,8 +20,8 @@
 #include "ContentProtection.h"
 
 #define API_VERSION_NUMBER_MAJOR 1
-#define API_VERSION_NUMBER_MINOR 0
-#define API_VERSION_NUMBER_PATCH 1
+#define API_VERSION_NUMBER_MINOR 1
+#define API_VERSION_NUMBER_PATCH 0
 
 namespace WPEFramework {
 namespace Plugin {

ContentProtection/ContentProtection.h

@@ -32,6 +32,7 @@ namespace Plugin {
     private:
         struct Session {
             string ClientId;
+            string AppId;
             Exchange::IContentProtection::KeySystem KeySystem;
         };
 
@@ -226,8 +227,10 @@ namespace Plugin {
             ShowWatermarkParams()
             {
                 Add(_T("show"), &Show);
+                Add(_T("alpha"), &Alpha);
             }
             Core::JSON::Boolean Show;
+            Core::JSON::DecUInt8 Alpha;
         };
 
         struct CreateWatermarkParams : public Core::JSON::Container {
@@ -338,6 +341,7 @@ namespace Plugin {
             }
 
             uint32_t OpenDrmSession(const string& clientId,
+                const string& appId,
                 KeySystem keySystem, const string& licenseRequest,
                 const string& initData, uint32_t& sessionId, string& response)
                 override
@@ -360,7 +364,7 @@ namespace Plugin {
                         in.ToString(response);
 
                         _parent._sessionStorage.Set(sessionId,
-                            { clientId, keySystem });
+                            { clientId, appId, keySystem });
                     }
                 }
                 return result;
@@ -445,11 +449,12 @@ namespace Plugin {
             }
 
             uint32_t ShowWatermark(uint32_t /*sessionId*/,
-                bool show, bool /*localOverlay*/) override
+                bool show, const uint8_t opacityLevel) override
             {
                 uint32_t result;
                 ShowWatermarkParams out;
                 out.Show = show;
+                out.Alpha = opacityLevel;
                 JsonObject in;
                 result = _parent._watermark->Invoke<
                     ShowWatermarkParams, JsonObject>(
@@ -562,8 +567,14 @@ namespace Plugin {
             ASSERT(_secManager->Subscribe<OnWatermarkSessionParams>(
                        Timeout, _T("onWatermarkSession"),
                        [&](const OnWatermarkSessionParams& params) {
+                           auto session = _sessionStorage.Get(
+                               params.SessionId);
+                           if (!session.IsSet()) {
+                               return; // No such session
+                           }
                            WatermarkStatusChanged(
                                params.SessionId,
+                               session.Value().AppId,
                                { ((params.ConditionContext == 1)
                                          ? State::GRANTED
                                          : ((params.ConditionContext == 2)
@@ -713,8 +724,14 @@ namespace Plugin {
                            auto watermark = _watermarkStorage
                                                 .Get(params.Image);
                            if (watermark.IsSet()) {
+                               auto session = _sessionStorage.Get(
+                                   watermark.Value().SessionId);
+                               if (!session.IsSet()) {
+                                   return; // No such session
+                               }
                                WatermarkStatusChanged(
                                    watermark.Value().SessionId,
+                                   session.Value().AppId,
                                    { State::FAILED, 20001 });
                            }
                        })
@@ -731,14 +748,15 @@ namespace Plugin {
             _watermark->Unsubscribe(Timeout, _T("onWatermarkRenderFailed"));
         }
         void WatermarkStatusChanged(uint32_t sessionId,
+            const string& appId,
             const Exchange::IContentProtection::INotification::Status& status)
         {
             Exchange::JContentProtection::Event::WatermarkStatusChanged(
-                *this, sessionId, status);
+                *this, sessionId, appId, status);
 
             Core::SafeSyncType<Core::CriticalSection> lock(_clientLock);
             for (auto& i : _clients) {
-                i->WatermarkStatusChanged(sessionId, status);
+                i->WatermarkStatusChanged(sessionId, appId, status);
             }
         }
 

Tests/L1Tests/CMakeLists.txt

@@ -72,7 +72,7 @@ include_directories(../../LocationSync
         ../../UsbAccess
         ../../Timer
         ../../LoggingPreferences
-        ../../UserPreferences
+        #../../UserPreferences
         ../../Messenger
         ../../DeviceInfo
         ../../helpers
@@ -115,7 +115,7 @@ link_directories(../../LocationSync
         ../../Timer
         ../../LoggingPreferences
         ../../SystemServices
-        ../../UserPreferences
+        #../../UserPreferences
         ../../Messenger
         ../../DeviceInfo
         ../../HdmiInput
@@ -156,7 +156,7 @@ target_link_libraries(${PROJECT_NAME}
         ${NAMESPACE}Timer
         ${NAMESPACE}LoggingPreferences
         ${NAMESPACE}SystemServices
-        ${NAMESPACE}UserPreferences
+       # ${NAMESPACE}UserPreferences
         ${NAMESPACE}Messenger
         ${NAMESPACE}DeviceInfo
         ${NAMESPACE}HdmiInput

Tests/L1Tests/tests/test_UserPreferences.cpp

@@ -17,6 +17,8 @@
  * limitations under the License.
  **/
 
+#if 0
+
 #include "gtest/gtest.h"
 
 #include "UserPreferences.h"
@@ -87,3 +89,5 @@ TEST_F(UserPreferencesTest, setUILanguage)
 
     file.Destroy();
 }
+
+#endif

Tests/L2Tests/L2TestsPlugin/CMakeLists.txt

@@ -47,6 +47,10 @@ if(PLUGIN_USERSETTINGS)
     set(SRC_FILES ${SRC_FILES} tests/UserSettings_L2Test.cpp)
 endif()
 
+if(PLUGIN_USERPREFERENCES)
+    set(SRC_FILES ${SRC_FILES} tests/UserPreferences_L2Test.cpp) 
+endif()
+
 if(PLUGIN_SYSTEMMODE)
     set(SRC_FILES ${SRC_FILES} tests/SystemMode_L2Test.cpp)
 endif()