diff --git a/SystemServices/CHANGELOG.md b/SystemServices/CHANGELOG.md index 9f769442be..e74d3f9cc7 100644 --- 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.7] - 2024-10-29 +### Changed +- RDK-49322: use manufacturer name from serialized location instead of hardcoded + ## [2.1.6] - 2024-09-12 ### Fixed - Fixed retruing DEEPSLEEP state for getPowerState. diff --git a/SystemServices/SystemServices.cpp b/SystemServices/SystemServices.cpp index a7311deaf2..50f2631cd6 100644 --- a/SystemServices/SystemServices.cpp +++ b/SystemServices/SystemServices.cpp @@ -994,7 +994,25 @@ namespace WPEFramework { // there is no /tmp/.make from /lib/rdk/getDeviceDetails.sh, but it can be taken from /etc/device.properties if (queryParams.empty() || queryParams == "make") { +#ifdef USE_SERIALIZED_MANUFACTURER_NAME + IARM_Bus_MFRLib_GetSerializedData_Param_t param; + param.bufLen = 0; + param.type = mfrSERIALIZED_TYPE_MANUFACTURER; + IARM_Result_t result = IARM_Bus_Call(IARM_BUS_MFRLIB_NAME, IARM_BUS_MFRLIB_API_GetSerializedData, ¶m, sizeof(param)); + param.buffer[param.bufLen] = '\0'; + + LOGWARN("SystemService getDeviceInfo param type %d result %s", param.type, param.buffer); + + bool status = false; + if (result == IARM_RESULT_SUCCESS) { + response["make"] = string(param.buffer); + retAPIStatus = true; + } else { + populateResponseWithError(SysSrv_MissingKeyValues, response); + } + +#else if (!Utils::fileExists(DEVICE_PROPERTIES_FILE)) { populateResponseWithError(SysSrv_FileNotPresent, response); returnResponse(retAPIStatus); @@ -1035,7 +1053,7 @@ namespace WPEFramework { } else { populateResponseWithError(SysSrv_MissingKeyValues, response); } - +#endif if (!queryParams.empty()) { returnResponse(retAPIStatus); }