Merge branch 'sprint/2401' into sprint/2401

gururaajar · Feb 2, 2024 · 75531a0 · 75531a0
2 parents 779fe57 + cb3e72a
commit 75531a0
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 7 deletions.
diff --git a/NetworkManager/service/Network.conf.in b/NetworkManager/service/Network.conf.in
@@ -15,7 +15,7 @@ connectivity.add("interval", "@PLUGIN_NETWORKMANAGER_CONN_MONITOR_INTERVAL@")
 
 stun = JSON()
 stun.add("endpoint", "@PLUGIN_NETWORKMANAGER_STUN_ENDPOINT@")
-stun.add("port", "19310")
+stun.add("port", "@PLUGIN_NETWORKMANAGER_STUN_PORT@")
 stun.add("interval", "30")
 
 configuration = JSON()

diff --git a/NetworkManager/service/Network.config b/NetworkManager/service/Network.config
@@ -19,10 +19,9 @@ map()
    key(stun)
    map()
       kv(endpoint, ${PLUGIN_NETWORKMANAGER_STUN_ENDPOINT})
-      kv(port, 19310)
+      kv(port, PLUGIN_NETWORKMANAGER_STUN_PORT)
       kv(interval, 30)
    end()
    kv(loglevel, 3)
 end()
 ans(configuration)
-
diff --git a/NetworkManager/service/NetworkManager.conf.in b/NetworkManager/service/NetworkManager.conf.in
@@ -15,7 +15,7 @@ connectivity.add("interval", "@PLUGIN_NETWORKMANAGER_CONN_MONITOR_INTERVAL@")
 
 stun = JSON()
 stun.add("endpoint", "@PLUGIN_NETWORKMANAGER_STUN_ENDPOINT@")
-stun.add("port", "19310")
+stun.add("port", "@PLUGIN_NETWORKMANAGER_STUN_PORT@")
 stun.add("interval", "30")
 
 configuration = JSON()

diff --git a/NetworkManager/service/NetworkManager.config b/NetworkManager/service/NetworkManager.config
@@ -19,7 +19,7 @@ map()
    key(stun)
    map()
       kv(endpoint, ${PLUGIN_NETWORKMANAGER_STUN_ENDPOINT})
-      kv(port, 19310)
+      kv(port, PLUGIN_NETWORKMANAGER_STUN_PORT)
       kv(interval, 30)
    end()
    kv(loglevel, 3)

diff --git a/NetworkManager/service/WiFiManager.conf.in b/NetworkManager/service/WiFiManager.conf.in
@@ -15,7 +15,7 @@ connectivity.add("interval", "@PLUGIN_NETWORKMANAGER_CONN_MONITOR_INTERVAL@")
 
 stun = JSON()
 stun.add("endpoint", "@PLUGIN_NETWORKMANAGER_STUN_ENDPOINT@")
-stun.add("port", "19310")
+stun.add("port", "@PLUGIN_NETWORKMANAGER_STUN_PORT@")
 stun.add("interval", "30")
 
 configuration = JSON()

diff --git a/NetworkManager/service/WiFiManager.config b/NetworkManager/service/WiFiManager.config
@@ -19,7 +19,7 @@ map()
    key(stun)
    map()
       kv(endpoint, ${PLUGIN_NETWORKMANAGER_STUN_ENDPOINT})
-      kv(port, 19310)
+      kv(port, PLUGIN_NETWORKMANAGER_STUN_PORT)
       kv(interval, 30)
    end()
    kv(loglevel, 3)

diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md
@@ -16,6 +16,9 @@ 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.7.4] - 2023-01-04
+### Fixed
+- Fix for getPlatformConfiguration api returning empty deviceType
 
 ## [2.0.1] - 2024-01-02
 ### Security

diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp
@@ -1043,6 +1043,7 @@ namespace WPEFramework {
 
             if (res.size() > 0) {
                 std::string model_number;
+		std::string device_type;
                 if (queryParams.empty()) {
                     retAPIStatus = true;
 
@@ -1070,6 +1071,9 @@ namespace WPEFramework {
                             else if (key == "model_number") {
                                 model_number = value;
                             }
+			    else if(key == "device_type") {
+				device_type = value;
+			    }
                         }
                     }
 #ifdef ENABLE_DEVICE_MANUFACTURER_INFO

diff --git a/SystemServices/platformcaps/platformcapsdatarpc.cpp b/SystemServices/platformcaps/platformcapsdatarpc.cpp
@@ -48,6 +48,7 @@ string PlatformCapsData::GetModel() {
       .Get(_T("model_number")).String();
 }
 
+#ifndef ENABLE_COMMUNITY_DEVICE_TYPE
 string PlatformCapsData::GetDeviceType() {
   auto hex = jsonRpc.invoke(_T("org.rdk.AuthService"),
                             _T("getDeviceInfo"), 10000)
@@ -58,6 +59,13 @@ string PlatformCapsData::GetDeviceType() {
   std::regex_search(deviceInfo, m, std::regex("deviceType=(\\w+),"));
   return (m.empty() ? string() : m[1]);
 }
+#else
+string PlatformCapsData::GetDeviceType() {
+  return jsonRpc.invoke(_T("org.rdk.System"),
+                        _T("getDeviceInfo"), 10000)
+      .Get(_T("device_type")).String();
+}
+#endif
 
 string PlatformCapsData::GetHDRCapability() {
   JsonArray hdrCaps = jsonRpc.invoke(_T("org.rdk.DisplaySettings"),