Skip to content

Commit 40c64d1

Browse files
authored
Merge branch 'develop' into feature/ResourceManager_interface_header
2 parents 8474d12 + 1b8f035 commit 40c64d1

File tree

39 files changed

+1299
-466
lines changed

39 files changed

+1299
-466
lines changed

.github/workflows/validate_interface_headers.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,12 @@ def validate_header(file_path, issues, ids_lines):
232232
if id_value_pattern.search(line):
233233
issues.append(f"Line {i + 1}: An enum ID of file {os.path.basename(file_path)} has not been defined with offset in Ids.h file: {id_value}")
234234
break
235+
236+
# Check for @in tag usage in method parameters (but allow @inout)
237+
in_tag_pattern = re.compile(r'/\*[^*]*@in(?!out)[^*]*\*/')
238+
for i, line in enumerate(lines):
239+
if in_tag_pattern.search(line):
240+
issues.append(f"Line {i + 1}: Usage of @in tag is not allowed in file '{file_path}'. Method parameters are input by default: {line.strip()}")
235241

236242

237243
def main():

.github/workflows/validate_interface_headers_incremental.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,12 @@ def validate_header(file_path, issues, ids_lines):
235235
issues.append(f"Line {i + 1}: An enum ID of file {os.path.basename(file_path)} has not been defined with offset in Ids.h file: {id_value}")
236236
break
237237

238+
# Check for @in tag usage in method parameters (but allow @inout)
239+
in_tag_pattern = re.compile(r'/\*[^*]*@in(?!out)[^*]*\*/')
240+
for i, line in enumerate(lines):
241+
if in_tag_pattern.search(line):
242+
issues.append(f"Line {i + 1}: Usage of @in tag is not allowed in file '{file_path}'. Method parameters are input by default: {line.strip()}")
243+
238244

239245
def main(changed_files_path):
240246
ids_file_path = 'apis/Ids.h'

CHANGELOG.md

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,104 @@ 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+
#### [2.1.1](https://github.com/rdkcentral/entservices-apis/compare/2.1.0...2.1.1)
8+
9+
- RDKEMW-9667: Remove setSystemMode API from PowerManger Plugin [`#586`](https://github.com/rdkcentral/entservices-apis/pull/586)
10+
- Merge tag '2.1.0' into develop [`275e508`](https://github.com/rdkcentral/entservices-apis/commit/275e508497c4ce8ca2aa4d27b7a48a0124ba16d6)
11+
12+
#### [2.1.0](https://github.com/rdkcentral/entservices-apis/compare/2.0.1...2.1.0)
13+
14+
> 29 October 2025
15+
16+
- Reason for change (RDKEMW-9517) : Update API documentation for OCIContainer plugin [`#587`](https://github.com/rdkcentral/entservices-apis/pull/587)
17+
- 2.1.0 release changelog updates [`3e55944`](https://github.com/rdkcentral/entservices-apis/commit/3e559448a131c75fe513ddf1b4416ac6662d3c7a)
18+
- Merge tag '2.0.1' into develop [`d8a89dd`](https://github.com/rdkcentral/entservices-apis/commit/d8a89dd42b469c59690b8e6055e25cb7e55fc526)
19+
20+
#### [2.0.1](https://github.com/rdkcentral/entservices-apis/compare/2.0.0...2.0.1)
21+
22+
> 24 October 2025
23+
24+
- RDKEMW-9133: Update validate_interface_headers.py [`#568`](https://github.com/rdkcentral/entservices-apis/pull/568)
25+
- 2.0.1 release changelog updates [`9e11b73`](https://github.com/rdkcentral/entservices-apis/commit/9e11b7316840710648e1f013b34f462c7734a198)
26+
- Merge tag '2.0.0' into develop [`9fe0b9d`](https://github.com/rdkcentral/entservices-apis/commit/9fe0b9dde5a04df92210cbdc885d8fc81fffc2ef)
27+
28+
### [2.0.0](https://github.com/rdkcentral/entservices-apis/compare/1.17.0...2.0.0)
29+
30+
> 17 October 2025
31+
32+
- RDKEMW-7763: Create a Migration plugin and add the corresponding APIs [`#546`](https://github.com/rdkcentral/entservices-apis/pull/546)
33+
- rebase [`#540`](https://github.com/rdkcentral/entservices-apis/pull/540)
34+
- RDKEMW-7763: Update MigrationPlugin.md [`6403e2c`](https://github.com/rdkcentral/entservices-apis/commit/6403e2c2072d3abb5d50215862aa95216cf68b78)
35+
- 2.0.0 release changelog updates [`161e2ce`](https://github.com/rdkcentral/entservices-apis/commit/161e2ce9fa32e8f901b0480eb085432a577e6d3b)
36+
- RDKEMW-7763: Remove BOOT_TYPE_INCONCLUSIVE from BootType enum [`d6e51be`](https://github.com/rdkcentral/entservices-apis/commit/d6e51be7c75e4ac1b7911ce712513ce4fc2ad33d)
37+
38+
#### [1.17.0](https://github.com/rdkcentral/entservices-apis/compare/1.16.23...1.17.0)
39+
40+
> 13 October 2025
41+
42+
- RDKEMW-8150 : Move Firmware related APIs from SystemServices plugin to FirmwareUpdate Plugin [`#522`](https://github.com/rdkcentral/entservices-apis/pull/522)
43+
- 1.17.0 release changelog updates [`d38ed72`](https://github.com/rdkcentral/entservices-apis/commit/d38ed72f65b0ab04431db343c5516d8fd19c9f3f)
44+
- RDKEMW-8150: Move Firmware related APIs from System plugin to FirmwareUpdate [`50865c5`](https://github.com/rdkcentral/entservices-apis/commit/50865c5ed3746bc10a65ec181da367179a78155c)
45+
- Update IFirmwareUpdate.h [`29d1c00`](https://github.com/rdkcentral/entservices-apis/commit/29d1c000020f89f79bef3d0dba68f3d02638a551)
46+
47+
#### [1.16.23](https://github.com/rdkcentral/entservices-apis/compare/1.16.22...1.16.23)
48+
49+
> 13 October 2025
50+
51+
- RDKEMW-7761: Telemetry Document updation [`#553`](https://github.com/rdkcentral/entservices-apis/pull/553)
52+
- 1.16.23 release changelog updates [`2a2fdf6`](https://github.com/rdkcentral/entservices-apis/commit/2a2fdf650daf16b564fedf4360b9dbe5bc5c7457)
53+
- Merge tag '1.16.22' into develop [`8a1c278`](https://github.com/rdkcentral/entservices-apis/commit/8a1c278d5f081e353d5a6e753caff42237a6619e)
54+
55+
#### [1.16.22](https://github.com/rdkcentral/entservices-apis/compare/1.16.21...1.16.22)
56+
57+
> 9 October 2025
58+
59+
- RDKEMW-6752: AI2.0 DownloadManager plugin [`#560`](https://github.com/rdkcentral/entservices-apis/pull/560)
60+
- bring latest changes [`#562`](https://github.com/rdkcentral/entservices-apis/pull/562)
61+
- 1.16.22 release changelog updates [`7745b5a`](https://github.com/rdkcentral/entservices-apis/commit/7745b5a3d0e15180c129609ac0b07284851c71e5)
62+
- Merge tag '1.16.21' into develop [`5fb02f4`](https://github.com/rdkcentral/entservices-apis/commit/5fb02f44a1e92a12f2dd529774ef99dc43a264e4)
63+
- RDKEMW-6751: [AI2.0][DM] [AI2.0][DM] Create IDownloader interface [`a600c0d`](https://github.com/rdkcentral/entservices-apis/commit/a600c0d76e01031c4a1175fb95385c035bd25afe)
64+
65+
#### [1.16.21](https://github.com/rdkcentral/entservices-apis/compare/1.16.20...1.16.21)
66+
67+
> 8 October 2025
68+
69+
- RDKEMW-8619 : Multiple issues on FrameRate plugin. [`#564`](https://github.com/rdkcentral/entservices-apis/pull/564)
70+
- 1.16.21 release changelog updates [`d902e58`](https://github.com/rdkcentral/entservices-apis/commit/d902e58924bd92709a6a1d810065fddd34d8e14a)
71+
- Merge tag '1.16.20' into develop [`aaf4ef9`](https://github.com/rdkcentral/entservices-apis/commit/aaf4ef9cc2d446ca6a9c57524659f85d5c580eb8)
72+
73+
#### [1.16.20](https://github.com/rdkcentral/entservices-apis/compare/1.16.19...1.16.20)
74+
75+
> 7 October 2025
76+
77+
- RDKEMW-6787: [AI2.0] Create IPreInstallerManager interface [`#456`](https://github.com/rdkcentral/entservices-apis/pull/456)
78+
- 1.16.20 release changelog updates [`ecdf7be`](https://github.com/rdkcentral/entservices-apis/commit/ecdf7be765d014d0a6631e3bc13d3cbec1769fe8)
79+
- Merge tag '1.16.19' into develop [`40401b5`](https://github.com/rdkcentral/entservices-apis/commit/40401b55eb7c1fc2d9938f37326a17e83daa506c)
80+
81+
#### [1.16.19](https://github.com/rdkcentral/entservices-apis/compare/1.16.18...1.16.19)
82+
83+
> 7 October 2025
84+
85+
- RDKEMW-7401: getLoadedApps Response Contains Escape Characters [`#557`](https://github.com/rdkcentral/entservices-apis/pull/557)
86+
- 1.16.19 release changelog updates [`da2eb34`](https://github.com/rdkcentral/entservices-apis/commit/da2eb34244b204d24dd6c488d2aaa9e962ac9231)
87+
- Merge tag '1.16.18' into develop [`c48961e`](https://github.com/rdkcentral/entservices-apis/commit/c48961e9510fe135fc6cf1fb74ec8603ba922faf)
88+
- Update IAppManager.h [`a7e341f`](https://github.com/rdkcentral/entservices-apis/commit/a7e341f35b2fbb5b137b9184a054ba47b1101bee)
89+
90+
#### [1.16.18](https://github.com/rdkcentral/entservices-apis/compare/1.16.17...1.16.18)
91+
92+
> 6 October 2025
93+
94+
- RDKEMW-7722: Align PowerManager WakeupSrcConfiguration API's with SystemService plugin [`#541`](https://github.com/rdkcentral/entservices-apis/pull/541)
95+
- review rework [`efccf63`](https://github.com/rdkcentral/entservices-apis/commit/efccf63fffccd81b05d8da8ece10c9d41e61da16)
96+
- 1.16.18 release changelog updates [`dab423a`](https://github.com/rdkcentral/entservices-apis/commit/dab423ae2f2141426da918d53c8fefb3dc3ddba5)
97+
- review rework [`9641b4b`](https://github.com/rdkcentral/entservices-apis/commit/9641b4b8f1f51c1e8b84cfcefa2d8e6e70cd0e0c)
98+
799
#### [1.16.17](https://github.com/rdkcentral/entservices-apis/compare/1.16.16...1.16.17)
8100

101+
> 1 October 2025
102+
9103
- RDKEMW-8613: HdmiCecSource Documentation Update [`#552`](https://github.com/rdkcentral/entservices-apis/pull/552)
104+
- 1.16.17 release changelog updates [`9c5e8ca`](https://github.com/rdkcentral/entservices-apis/commit/9c5e8ca0ecfb2c3df4cbe9b33ebcdbc25b7e744b)
10105
- Merge tag '1.16.16' into develop [`4d24990`](https://github.com/rdkcentral/entservices-apis/commit/4d249906b98af0fb5bf2a050724c512f1bd55ec5)
11106

12107
#### [1.16.16](https://github.com/rdkcentral/entservices-apis/compare/1.16.15...1.16.16)

apis/AmazonPrime/IAmazonPrime.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ namespace Exchange {
5151
virtual ~IAmazon() {}
5252

5353
/** Register notification interface */
54-
virtual Core::hresult Register(IAmazon::INotification* amazon /* @in */) = 0;
54+
virtual Core::hresult Register(IAmazon::INotification* amazon) = 0;
5555
/** Unregister notification interface */
56-
virtual Core::hresult Unregister(IAmazon::INotification* amazon /* @in */) = 0;
56+
virtual Core::hresult Unregister(IAmazon::INotification* amazon) = 0;
5757

5858
/** To send deeplink command to amazon prime application **/
5959
// @text setDeepLink

apis/Analytics/IAnalytics.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ namespace Exchange {
4646
// @param appId: Durable App Id string
4747
// @param eventPayload: Payload of the event
4848

49-
virtual Core::hresult SendEvent(const string& eventName /* @in */,
50-
const string& eventVersion /* @in */,
51-
const string& eventSource /* @in */,
52-
const string& eventSourceVersion /* @in */,
53-
IStringIterator* const& cetList /* @in */,
54-
const uint64_t epochTimestamp /* @in */,
55-
const uint64_t uptimeTimestamp /* @in */,
56-
const string& appId /* @in */,
57-
const string& eventPayload /* @in */ ) = 0;
49+
virtual Core::hresult SendEvent(const string& eventName ,
50+
const string& eventVersion ,
51+
const string& eventSource ,
52+
const string& eventSourceVersion ,
53+
IStringIterator* const& cetList ,
54+
const uint64_t epochTimestamp ,
55+
const uint64_t uptimeTimestamp ,
56+
const string& appId ,
57+
const string& eventPayload ) = 0;
5858
};
5959
}
6060
}

apis/AppManager/IAppManager.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ struct RuntimeConfig
5757
#define RUNTIME_CONFIG
5858
#endif
5959

60+
// @stubgen:include <com/IIteratorType.h>
61+
6062
// @json 1.0.0 @text:keep
6163
struct EXTERNAL IAppManager : virtual public Core::IUnknown {
6264
enum { ID = ID_APPMANAGER };
@@ -86,6 +88,16 @@ struct EXTERNAL IAppManager : virtual public Core::IUnknown {
8688
APP_ERROR_PACKAGE_LOCK = 8 /* @text APP_ERROR_PACKAGE_LOCK */
8789
};
8890

91+
struct LoadedAppInfo
92+
{
93+
string appId ;
94+
string appInstanceId ;
95+
string activeSessionId;
96+
AppLifecycleState targetLifecycleState;
97+
AppLifecycleState currentLifecycleState;
98+
};
99+
using ILoadedAppInfoIterator = RPC::IIteratorType<LoadedAppInfo,ID_LOADED_APP_INFO_ITERATOR>;
100+
89101
// @event
90102
struct EXTERNAL INotification : virtual public Core::IUnknown {
91103
enum { ID = ID_APPMANAGER_NOTIFICATION };
@@ -145,7 +157,7 @@ struct EXTERNAL IAppManager : virtual public Core::IUnknown {
145157
// @text getLoadedApps
146158
// @brief Retrieves a list of applications currently loaded on the system.
147159
// @param apps A list containing the details of loaded applications
148-
virtual Core::hresult GetLoadedApps(string& apps /* @out */) = 0;
160+
virtual Core::hresult GetLoadedApps(ILoadedAppInfoIterator*& apps /* @out */) = 0;
149161

150162
/** Launches an Application **/
151163
// @text launchApp

apis/DeviceDiagnostics/IDeviceDiagnostics.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ namespace WPEFramework
5555
virtual void OnAVDecoderStatusChanged(const string& avDecoderStatusChange) {};
5656
};
5757

58-
virtual Core::hresult Register(IDeviceDiagnostics::INotification* notification /* @in */) = 0;
59-
virtual Core::hresult Unregister(IDeviceDiagnostics::INotification* notification /* @in */) = 0;
58+
virtual Core::hresult Register(IDeviceDiagnostics::INotification* notification ) = 0;
59+
virtual Core::hresult Unregister(IDeviceDiagnostics::INotification* notification ) = 0;
6060

6161
// @text getConfiguration
6262
// @brief Gets the values associated with the corresponding property names
6363
// @param names - in - String array of property names
6464
// @param paramList - out - specified properties and their values
6565
// @param success - out - boolean
66-
virtual Core::hresult GetConfiguration(IStringIterator* const& names /* @in */, IDeviceDiagnosticsParamListIterator*& paramList /* @out */, bool& success /* @out */) = 0;
66+
virtual Core::hresult GetConfiguration(IStringIterator* const& names , IDeviceDiagnosticsParamListIterator*& paramList /* @out */, bool& success /* @out */) = 0;
6767

6868
// @text getMilestones
6969
// @brief Returns the list of milestones
@@ -75,7 +75,7 @@ namespace WPEFramework
7575
// @brief Log marker string to rdk milestones log
7676
// @param marker - in - string
7777
// @param success - out - boolean
78-
virtual Core::hresult LogMilestone(const string& marker /* @in */, bool& success /* @out */) = 0;
78+
virtual Core::hresult LogMilestone(const string& marker , bool& success /* @out */) = 0;
7979

8080
// @text getAVDecoderStatus
8181
// @brief Gets the most active status of audio/video decoder/pipeline

apis/DeviceInfo/IDeviceInfo.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ namespace Exchange {
8888
typedef RPC::IIteratorType<MS12Profile, ID_DEVICE_CAPABILITIES_AUDIO_MS12_PROFILE> IMS12ProfileIterator;
8989

9090
virtual Core::hresult SupportedAudioPorts(RPC::IStringIterator*& supportedAudioPorts /* @out */) const = 0;
91-
virtual Core::hresult AudioCapabilities(const string& audioPort /* @in */, IAudioCapabilityIterator*& audioCapabilities /* @out */) const = 0;
92-
virtual Core::hresult MS12Capabilities(const string& audioPort /* @in */, IMS12CapabilityIterator*& ms12Capabilities /* @out */) const = 0;
93-
virtual Core::hresult SupportedMS12AudioProfiles(const string& audioPort /* @in */, RPC::IStringIterator*& supportedMS12AudioProfiles /* @out */) const = 0;
91+
virtual Core::hresult AudioCapabilities(const string& audioPort , IAudioCapabilityIterator*& audioCapabilities /* @out */) const = 0;
92+
virtual Core::hresult MS12Capabilities(const string& audioPort , IMS12CapabilityIterator*& ms12Capabilities /* @out */) const = 0;
93+
virtual Core::hresult SupportedMS12AudioProfiles(const string& audioPort , RPC::IStringIterator*& supportedMS12AudioProfiles /* @out */) const = 0;
9494
};
9595

9696
struct EXTERNAL IDeviceVideoCapabilities : virtual public Core::IUnknown {
@@ -150,10 +150,10 @@ namespace Exchange {
150150
typedef RPC::IIteratorType<ScreenResolution, ID_DEVICE_CAPABILITIES_RESOLUTION> IScreenResolutionIterator;
151151

152152
virtual Core::hresult SupportedVideoDisplays(RPC::IStringIterator*& supportedVideoDisplays /* @out */) const = 0;
153-
virtual Core::hresult DefaultResolution(const string& videoDisplay /* @in */, string& defaultResolution /* @out */) const = 0;
154-
virtual Core::hresult SupportedResolutions(const string& videoDisplay /* @in */, RPC::IStringIterator*& supportedResolutions /* @out */) const = 0;
153+
virtual Core::hresult DefaultResolution(const string& videoDisplay , string& defaultResolution /* @out */) const = 0;
154+
virtual Core::hresult SupportedResolutions(const string& videoDisplay , RPC::IStringIterator*& supportedResolutions /* @out */) const = 0;
155155
virtual Core::hresult HostEDID(string& edid /* @out */) const = 0;
156-
virtual Core::hresult SupportedHdcp(const string& videoDisplay /* @in */, CopyProtection& supportedHDCPVersion /* @out */) const = 0;
156+
virtual Core::hresult SupportedHdcp(const string& videoDisplay , CopyProtection& supportedHDCPVersion /* @out */) const = 0;
157157
};
158158
}
159159
}

0 commit comments

Comments
 (0)