Skip to content

Commit 3c94c36

Browse files
authored
Merge branch 'develop' into feature/RDKEMW-3529-VRR_support
2 parents c618447 + 577f421 commit 3c94c36

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.3.8](https://github.com/rdkcentral/entservices-apis/compare/1.3.7...1.3.8)
8+
9+
- RDKEMW-1014 : Add COM-RPC support to HdcpProfile plugin [`#173`](https://github.com/rdkcentral/entservices-apis/pull/173)
10+
- RDKEMW-2374: Create md_from_h_generator tool [`#142`](https://github.com/rdkcentral/entservices-apis/pull/142)
11+
- Merge tag '1.3.7' into develop [`d80db1c`](https://github.com/rdkcentral/entservices-apis/commit/d80db1cf09906bcaf28b2d5f42a5f4e83f5fa558)
12+
713
#### [1.3.7](https://github.com/rdkcentral/entservices-apis/compare/1.3.6...1.3.7)
814

15+
> 28 April 2025
16+
917
- RDKEMW-2907: USBPlugins Updates [`#137`](https://github.com/rdkcentral/entservices-apis/pull/137)
1018
- RDKEMW-1014 : Add COM-RPC support to HdcpProfile plugin [`#94`](https://github.com/rdkcentral/entservices-apis/pull/94)
1119
- Rebase [`#147`](https://github.com/rdkcentral/entservices-apis/pull/147)

apis/HdcpProfile/IHdcpProfile.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
struct EXTERNAL IHdcpProfile : virtual public Core::IUnknown
2929
{
3030
enum { ID = ID_HDCPPROFILE };
31-
31+
3232
struct EXTERNAL HDCPStatus
3333
{
3434
bool isConnected /* @text isConnected */ /* @brief Indicates whether a display is connected */;
@@ -48,7 +48,7 @@
4848
// @text onDisplayConnectionChanged
4949
// @brief Triggered if HDMI was connected or disconnected upon receiving onHdmiOutputHotPlug
5050
// @param HDCPStatus: Contains HDCP-related data as separate properties
51-
virtual void OnDisplayConnectionChanged(const HDCPStatus hdcpStatus) {};
51+
virtual void OnDisplayConnectionChanged(const HDCPStatus hdcpStatus/* @text HDCPStatus*/) {};
5252
};
5353
virtual Core::hresult Register(IHdcpProfile::INotification* notification /* @in */) = 0;
5454
virtual Core::hresult Unregister(IHdcpProfile::INotification* notification /* @in */) = 0;

apis/PackageManager/IAppPackageManager.h

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,30 @@
66

77
namespace WPEFramework {
88
namespace Exchange {
9+
#ifndef RUNTIME_CONFIG
10+
struct RuntimeConfig {
11+
bool dial;
12+
bool wanLanAccess;
13+
bool thunder;
14+
int32_t systemMemoryLimit;
15+
int32_t gpuMemoryLimit;
16+
std::string envVars;
17+
uint32_t userId;
18+
uint32_t groupId;
19+
uint32_t dataImageSize;
20+
21+
bool resourceManagerClientEnabled;
22+
std::string dialId;
23+
std::string command;
24+
uint32_t appType;
25+
std::string appPath;
26+
std::string runtimePath;
27+
28+
std::string fireboltVersion;
29+
bool enableDebugger;
30+
};
31+
#define RUNTIME_CONFIG
32+
#endif
933

1034
// @json 1.0.0 @text:keep
1135
struct EXTERNAL IPackageDownloader : virtual public Core::IUnknown {
@@ -48,7 +72,7 @@ namespace Exchange {
4872
virtual Core::hresult Initialize(PluginHost::IShell* service) = 0;
4973

5074
// @json:omit
51-
virtual void Deinitialize(PluginHost::IShell* service) = 0;
75+
virtual Core::hresult Deinitialize(PluginHost::IShell* service) = 0;
5276

5377

5478
// @brief Download
@@ -191,7 +215,7 @@ namespace Exchange {
191215
virtual Core::hresult Config(
192216
const string &packageId,
193217
const string &version,
194-
string &config /* @out */ // XXX: JsonObject ?!
218+
RuntimeConfig &configMetadata /* @out */
195219
) = 0;
196220

197221
// @brief PackageState
@@ -232,7 +256,7 @@ namespace Exchange {
232256
const LockReason &lockReason,
233257
uint32_t &lockId /* @out */,
234258
string &unpackedPath /* @out */,
235-
string &configMetadata /* @out */,
259+
RuntimeConfig &configMetadata /* @out */,
236260
string &appMetadata /* @out */
237261
// XXX: appContextPath ?!
238262
) = 0;
@@ -253,7 +277,7 @@ namespace Exchange {
253277
const string &packageId,
254278
const string &version,
255279
string &unpackedPath /* @out */,
256-
string &configMetadata /* @out */,
280+
RuntimeConfig &configMetadata /* @out */,
257281
string &gatewayMetadataPath /* @out */,
258282
bool &locked /* @out */
259283
) = 0;

0 commit comments

Comments
 (0)