DELIA-67834 : Removed privacyMode related code from SystemServices. (rdkcentral#6275)

* DELIA-67834 : Removed privacyMode related code from SystemServices.
Changed onPrivacyModeChanged handler to use UserSettings instead of SystemServices
Removed PrivacyModeChanged rbus event emission from UserSettings.

* Disabled Telemetry tests since IUserSettings isn't available.

* Telemetry plugin is enabled/disabled in yml.

* Removed privacyMode calls from header.

* Added T2 notification about privacy mode to Initialize()

* Updated version and changelog.

* Updated docs.

* Updated docs.

* Updated docs.

Author: sborushevsky

.github/workflows/L1-tests.yml

@@ -271,7 +271,7 @@ jobs:
           -DPLUGIN_DEVICEIDENTIFICATION=ON
           -DPLUGIN_FRAMERATE=ON
           -DPLUGIN_AVINPUT=ON
-          -DPLUGIN_TELEMETRY=ON
+          -DPLUGIN_TELEMETRY=OFF
           -DPLUGIN_SCREENCAPTURE=ON
           -DPLUGIN_USBACCESS=ON
           -DPLUGIN_LOGGINGPREFERENCES=ON

.github/workflows/L2-tests.yml

@@ -229,7 +229,7 @@ jobs:
           -DCMAKE_DISABLE_FIND_PACKAGE_RFC=ON
           -DCMAKE_DISABLE_FIND_PACKAGE_RBus=ON
           -DPLUGIN_SYSTEMSERVICES=ON
-          -DPLUGIN_TELEMETRY=ON
+          -DPLUGIN_TELEMETRY=OFF
           -DPLUGIN_WAREHOUSE=ON
           -DPLUGIN_HDCPPROFILE=ON
           -DPLUGIN_TEXTTOSPEECH=ON

SystemServices/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.
 
+## [3.5.0] - 2025-06-10
+### Removed
+- Removed Privacy Mode calls.
+
 ## [3.4.5] - 2025-06-02
 ### Updated
 - Updated setDeepSleepTimer to accept timeout only for 10 days max sec

SystemServices/System.json

@@ -1985,35 +1985,6 @@
                 ]
             }
         },
-        "setPrivacyMode": {
-            "summary": "Setting Privacy Mode.",          
-            "events": {
-                "onPrivacyModeChanged" : "Triggered when the Privacy Mode changes."
-            },
-            "params": {
-                "type": "object",
-                "properties": {
-                    "privacyMode": {
-                        "summary": "New Privacy Mode",
-                        "type": "string",
-                        "example": "DO_NOT_SHARE"
-                    }
-                }
-            },
-            "result": {
-                "summary": "On success null will be returned",
-                "type": "string",
-                "example": "null"
-            }
-        },
-        "getPrivacyMode":{
-            "summary": "Getting Privacy Mode",
-            "result": {
-                "summary": "Current Privacy Mode",
-                "type": "string",
-                "example": "DO_NOT_SHARE"
-            }
-        },
         "getBootTypeInfo":{
             "summary": "Getting Boot Type",
             "result": {
@@ -2418,22 +2389,6 @@
                 ]
             }
         },
-        "onPrivacyModeChanged": {
-            "summary": "Triggered after the Privacy Mode changes (see `SetPrivacyMode`)",
-            "params": {
-                "type": "object",
-                "properties": {
-                    "privacyMode":{
-                        "summary": "Receive Privacy Mode changes",
-                        "type": "string",
-                        "example": "DO_NOT_SHARE"
-                    }
-                },
-                "required": [
-                    "privacyMode"
-                ]
-            }
-        },
         "onBlocklistChanged":{
             "summary": "Triggers when the blocklist flag is modified",
             "params": {

SystemServices/SystemServices.cpp

@@ -66,8 +66,8 @@
 using namespace std;
 
 #define API_VERSION_NUMBER_MAJOR 3
-#define API_VERSION_NUMBER_MINOR 4
-#define API_VERSION_NUMBER_PATCH 5
+#define API_VERSION_NUMBER_MINOR 5
+#define API_VERSION_NUMBER_PATCH 0
 
 #define MAX_REBOOT_DELAY 86400 /* 24Hr = 86400 sec */
 #define TR181_FW_DELAY_REBOOT "Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.AutoReboot.fwDelayReboot"
@@ -98,7 +98,6 @@ using namespace std;
 #define LOG_UPLOAD_STATUS_FAILURE "UPLOAD_FAILURE"
 #define LOG_UPLOAD_STATUS_ABORTED "UPLOAD_ABORTED"
 
-#define PRIVACY_MODE_FILE "/opt/secure/persistent/System/privacymode.txt"
 #define BOOTVERSION "/opt/.bootversion"
 
 /**
@@ -496,8 +495,6 @@ namespace WPEFramework {
             registerMethod("setFSRFlag", &SystemServices::setFSRFlag, this);
             registerMethod("getFSRFlag", &SystemServices::getFSRFlag, this);
 
-            registerMethod("setPrivacyMode", &SystemServices::setPrivacyMode, this);
-            registerMethod("getPrivacyMode", &SystemServices::getPrivacyMode, this);
             registerMethod("getBootTypeInfo", &SystemServices::getBootTypeInfo, this);
 
         }
@@ -4756,58 +4753,6 @@ namespace WPEFramework {
             returnResponse(true);
         }
 
-        uint32_t SystemServices::setPrivacyMode(const JsonObject& parameters, JsonObject& response)
-        {
-            LOGINFOMETHOD();
-
-            string privacyMode = parameters["privacyMode"].String();
-
-            if (privacyMode != "SHARE" && privacyMode != "DO_NOT_SHARE")
-            {
-                LOGERR("Wrong privacyMode value: '%s'", privacyMode.c_str());
-                returnResponse(false);
-            }
-            
-            makePersistentDir();
-
-            ofstream optfile;
-    		
-            optfile.open(PRIVACY_MODE_FILE, ios::out);
-            if (optfile)
-            {
-                optfile << privacyMode;
-                optfile.close();
-            }
-
-            JsonObject params;
-            params["privacyMode"] = privacyMode;
-            sendNotify(EVT_ONPRIVACYMODECHANGED, params);
-
-            returnResponse(true);
-        }
-
-        uint32_t SystemServices::getPrivacyMode(const JsonObject& parameters, JsonObject& response)
-        {
-            LOGINFOMETHOD();
-
-            string privacyMode = "";
-
-            string optOutStatus;
-
-            getFileContent(PRIVACY_MODE_FILE, privacyMode);
-            if (privacyMode != "SHARE" && privacyMode != "DO_NOT_SHARE")
-            {
-                LOGWARN("Wrong privacyMode value: '%s', returning default", privacyMode.c_str());
-                privacyMode = "SHARE";
-            }
-
-            response["privacyMode"] = privacyMode;
-
-            returnResponse(true);
-        }
-       
-
-        
         /***
          * @brief : To set the fsr flag into the emmc raw area.
          * @param1[in] : {"params":{"fsrFlag":<bool>}

SystemServices/SystemServices.h

@@ -70,7 +70,6 @@ using std::ofstream;
 #define EVT_FRIENDLYNAMECHANGED           "onFriendlyNameChanged"
 #define EVT_ONLOGUPLOAD                   "onLogUpload"
 #define EVT_ONDEVICEMGTUPDATERECEIVED     "onDeviceMgtUpdateReceived"
-#define EVT_ONPRIVACYMODECHANGED          "onPrivacyModeChanged"
 #define TERRITORYFILE                     "/opt/secure/persistent/System/Territory.txt"
 
 
@@ -304,8 +303,6 @@ namespace WPEFramework {
 		uint32_t getWakeupSrcConfiguration(const JsonObject& parameters, JsonObject& response);
                 uint32_t getPlatformConfiguration(const JsonObject& parameters, PlatformCaps& response);
                 uint32_t getThunderStartReason(const JsonObject& parameters, JsonObject& response);
-                uint32_t setPrivacyMode(const JsonObject& parameters, JsonObject& response);
-                uint32_t getPrivacyMode(const JsonObject& parameters, JsonObject& response);
                 uint32_t setFSRFlag(const JsonObject& parameters, JsonObject& response);
                 uint32_t getFSRFlag(const JsonObject& parameters, JsonObject& response);
                 uint32_t getBootTypeInfo(const JsonObject& parameters, JsonObject& response);

Telemetry/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.4.0] - 2025-6-10
+### Changed
+- Changed to use UserSettings plugin instead of SystemServices to get Privacy Mode.
+
 ## [1.3.0] - 2024-10-3
 ### Added
 - Added notifications for Telemetry component about changes in PrivacyMode.

Telemetry/Telemetry.cpp

@@ -54,10 +54,10 @@
 #define T2_PERSISTENT_FOLDER "/opt/.t2reportprofiles/"
 #define DEFAULT_PROFILES_FILE "/etc/t2profiles/default.json"
 
-#define SYSTEMSERVICES_CALLSIGN "org.rdk.System"
+#define USERSETTINGS_CALLSIGN "org.rdk.UserSettings"
 
 #define API_VERSION_NUMBER_MAJOR 1
-#define API_VERSION_NUMBER_MINOR 3
+#define API_VERSION_NUMBER_MINOR 4
 #define API_VERSION_NUMBER_PATCH 0
 
 #ifdef HAS_RBUS
@@ -96,6 +96,10 @@ namespace WPEFramework
 
         Telemetry::Telemetry()
         : PluginHost::JSONRPC()
+#ifdef HAS_RBUS
+        , _userSettingsPlugin(nullptr)
+        , _userSettingsNotification(*this)
+#endif
         {
             Telemetry::_instance = this;
 
@@ -117,43 +121,22 @@ namespace WPEFramework
 
 #ifdef HAS_RBUS
             PluginHost::IShell::state state;
-            if ((Utils::getServiceState(service, SYSTEMSERVICES_CALLSIGN, state) == Core::ERROR_NONE) && (state != PluginHost::IShell::state::ACTIVATED))
-                Utils::activatePlugin(service, SYSTEMSERVICES_CALLSIGN);
 
-            if ((Utils::getServiceState(service, SYSTEMSERVICES_CALLSIGN, state) == Core::ERROR_NONE) && (state == PluginHost::IShell::state::ACTIVATED))
+            if ((Utils::getServiceState(service, USERSETTINGS_CALLSIGN, state) == Core::ERROR_NONE) && (state != PluginHost::IShell::state::ACTIVATED))
+                Utils::activatePlugin(service, USERSETTINGS_CALLSIGN);
+
+            if ((Utils::getServiceState(service, USERSETTINGS_CALLSIGN, state) == Core::ERROR_NONE) && (state == PluginHost::IShell::state::ACTIVATED))
             {
-                m_systemServiceConnection = Utils::getThunderControllerClient(SYSTEMSERVICES_CALLSIGN);
+                ASSERT(service != nullptr);
 
-                if (!m_systemServiceConnection)
-                {
-                    LOGERR("%s plugin initialisation failed", SYSTEMSERVICES_CALLSIGN);
-                }
-                else
+                _userSettingsPlugin = service->QueryInterfaceByCallsign<WPEFramework::Exchange::IUserSettings>(USERSETTINGS_CALLSIGN);
+                if (_userSettingsPlugin)
                 {
-                    uint32_t err = m_systemServiceConnection->Subscribe<JsonObject>(2000, "onPrivacyModeChanged", [this](const JsonObject& parameters) {
-                        
-                        if (parameters.HasLabel("privacyMode"))
-                        {
-                            std::string privacyMode = parameters["privacyMode"].String();
-                            notifyT2PrivacyMode(privacyMode);
-                        }
-                        else
-                        {
-                            LOGERR("No 'privacyMode' parameter");
-                        }
-                    });
-
-                    if (err != Core::ERROR_NONE)
-                    {
-                        LOGERR("Failed to subscribe to onPrivacyModeChanged: %d", err);
-                    }
+                    _userSettingsPlugin->Register(&_userSettingsNotification);
 
-                    JsonObject params;
-                    JsonObject res;
-                    m_systemServiceConnection->Invoke<JsonObject, JsonObject>(2000, "getPrivacyMode", params, res);
-                    if (res["success"].Boolean())
+                    std::string privacyMode;
+                    if (_userSettingsPlugin->GetPrivacyMode(privacyMode) == Core::ERROR_NONE)
                     {
-                        std::string privacyMode = res["privacyMode"].String();
                         notifyT2PrivacyMode(privacyMode);
                     }
                     else
@@ -164,7 +147,7 @@ namespace WPEFramework
             }
             else
             {
-                LOGERR("%s plugin is not activated", SYSTEMSERVICES_CALLSIGN);
+                LOGERR("Failed to activate %s", USERSETTINGS_CALLSIGN);
             }
 #endif
 
@@ -258,6 +241,12 @@ namespace WPEFramework
                 rbus_close(rbusHandle);
                 rbusHandleStatus = RBUS_ERROR_NOT_INITIALIZED;
             }
+
+            if (_userSettingsPlugin) {
+                 _userSettingsPlugin->Unregister(&_userSettingsNotification);
+                 _userSettingsPlugin->Release();
+                 _userSettingsPlugin = nullptr;
+            }
 #endif
         }
 

Telemetry/Telemetry.h

@@ -21,6 +21,10 @@
 
 #include "Module.h"
 
+#ifdef HAS_RBUS
+#include <interfaces/IUserSettings.h>
+#endif
+
 namespace WPEFramework {
 
     namespace Plugin {
@@ -41,6 +45,33 @@ namespace WPEFramework {
         class Telemetry : public PluginHost::IPlugin, public PluginHost::JSONRPC {
         private:
 
+#ifdef HAS_RBUS
+            class UserSettingsNotification : public Exchange::IUserSettings::INotification {
+            private:
+                UserSettingsNotification(const UserSettingsNotification&) = delete;
+                UserSettingsNotification& operator=(const UserSettingsNotification&) = delete;
+
+            public:
+                explicit UserSettingsNotification(Telemetry& parent)
+                    : _parent(parent)
+                {
+                }
+
+                ~UserSettingsNotification() override = default;
+
+                void OnPrivacyModeChanged(const string& privacyMode)
+                {
+                    _parent.notifyT2PrivacyMode(privacyMode);
+                }
+
+                BEGIN_INTERFACE_MAP(UserSettingsNotification)
+                INTERFACE_ENTRY(Exchange::IUserSettings::INotification)
+                END_INTERFACE_MAP
+
+            private:
+                Telemetry& _parent;
+            };
+#endif
             // We do not allow this plugin to be copied !!
             Telemetry(const Telemetry&) = delete;
             Telemetry& operator=(const Telemetry&) = delete;
@@ -79,7 +110,10 @@ namespace WPEFramework {
         public:
             static Telemetry* _instance;
         private:
-            std::shared_ptr<WPEFramework::JSONRPC::LinkType<WPEFramework::Core::JSON::IElement>> m_systemServiceConnection;
+#ifdef HAS_RBUS
+            Exchange::IUserSettings* _userSettingsPlugin;
+            Core::Sink<UserSettingsNotification> _userSettingsNotification;
+#endif
         };
     } // namespace Plugin
 } // namespace WPEFramework

Tests/L1Tests/CMakeLists.txt

@@ -35,7 +35,6 @@ add_executable(${PROJECT_NAME}
         ../mocks/Iarm.cpp
         ../mocks/RBus.cpp
         ../mocks/MotionDetection.cpp
-        ../mocks/Telemetry.cpp
         ../mocks/Udev.cpp
         ../mocks/devicesettings.cpp
         ../mocks/HdmiCec.cpp
@@ -66,7 +65,6 @@ include_directories(../../LocationSync
         ../../DeviceDiagnostics
         ../../FrameRate
         ../../AVInput
-        ../../Telemetry
         ../../ScreenCapture
         ../../DataCapture
         ../../UsbAccess
@@ -108,7 +106,6 @@ link_directories(../../LocationSync
         ../../DeviceDiagnostics
         ../../FrameRate
         ../../AVInput
-        ../../Telemetry
         ../../ScreenCapture
         ../../DataCapture
         ../../UsbAccess
@@ -151,7 +148,6 @@ target_link_libraries(${PROJECT_NAME}
         ${NAMESPACE}FrameRate
         ${NAMESPACE}AVInput
         ${NAMESPACE}ScreenCapture
-        ${NAMESPACE}Telemetry
         ${NAMESPACE}UsbAccess
         ${NAMESPACE}Timer
         ${NAMESPACE}LoggingPreferences