Skip to content

Commit caa3b09

Browse files
committed
Merge branch 'release/1.4.1' into main
2 parents 618de53 + 3a67345 commit caa3b09

File tree

7 files changed

+201
-25
lines changed

7 files changed

+201
-25
lines changed

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,27 @@ 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.4.1](https://github.com/rdkcentral/entservices-apis/compare/1.4.0...1.4.1)
8+
9+
- RDKEMW-2653 ISystemMode.h Interface header not following coding guide… [`#219`](https://github.com/rdkcentral/entservices-apis/pull/219)
10+
- RDKEMW-2871 IFirmwareUpdate.h Interface header not following coding guidelines [`#218`](https://github.com/rdkcentral/entservices-apis/pull/218)
11+
- RDKEMW-2870: OCIContainer Interface header not following coding guidelines [`#210`](https://github.com/rdkcentral/entservices-apis/pull/210)
12+
- RDK-57747: Updated version details. [`#225`](https://github.com/rdkcentral/entservices-apis/pull/225)
13+
- Revert "RDKEMW-3890: [AI2.0][WindowManager] IRDKWindowManager - onRea… [`#227`](https://github.com/rdkcentral/entservices-apis/pull/227)
14+
- Revert "RDKEMW-3886 : [AppManager] Events registration" [`#217`](https://github.com/rdkcentral/entservices-apis/pull/217)
15+
- RDKEMW-3886 : [AppManager] Events registration [`#213`](https://github.com/rdkcentral/entservices-apis/pull/213)
16+
- RDKEMW-3890: [AI2.0][WindowManager] IRDKWindowManager - onReady, renderReady and enableDisplayRendering [`#214`](https://github.com/rdkcentral/entservices-apis/pull/214)
17+
- RDK-57747: RDKE: Add contentPin parameter in User Settings [`15540c6`](https://github.com/rdkcentral/entservices-apis/commit/15540c65d0c01e65ba94ec7c3879cd0f53023198)
18+
- Revert "RDKEMW-3890: [AI2.0][WindowManager] IRDKWindowManager - onReady, renderReady and enableDisplayRendering" [`f44260f`](https://github.com/rdkcentral/entservices-apis/commit/f44260f5dd4fcd0c86bfc18a5431b9b6f3319a1a)
19+
- [AI2.0][WindowManager] IRDKWindowManager - onReady, renderReady and enableDisplayRendering [`d524914`](https://github.com/rdkcentral/entservices-apis/commit/d524914ede96c6c0ae6694c9213de1c688bc4ac2)
20+
721
#### [1.4.0](https://github.com/rdkcentral/entservices-apis/compare/1.3.12...1.4.0)
822

23+
> 21 May 2025
24+
925
- RDKEMW-4358: Add ITextTrack interfaces for TTML overrides [`#200`](https://github.com/rdkcentral/entservices-apis/pull/200)
1026
- RDKEMW-4279 Update the DeviceDiagnostics plugin entservice-apis doc [`#197`](https://github.com/rdkcentral/entservices-apis/pull/197)
27+
- 1.4.0 release changelog updates [`d86ff58`](https://github.com/rdkcentral/entservices-apis/commit/d86ff58201297d5d50ed40ab147b70ec43e553c2)
1128
- Merge tag '1.3.12' into develop [`a6b3787`](https://github.com/rdkcentral/entservices-apis/commit/a6b37879afa86c84562ddc54a125f0f9b3bfb633)
1229

1330
#### [1.3.12](https://github.com/rdkcentral/entservices-apis/compare/1.3.11...1.3.12)

apis/FirmwareUpdate/IFirmwareUpdate.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ struct EXTERNAL IFirmwareUpdate : virtual public Core::IUnknown {
6464
// @param State : State
6565
// @param SubState: SubState
6666
// @text onUpdateStateChange
67-
virtual void OnUpdateStateChange (const State state , const SubState substate )= 0;
67+
virtual void OnUpdateStateChange (const State state , const SubState substate ) {};
6868

6969
// @brief This notification is raised between flashing started state and flashing succeeded/failed.
7070
// @param percentageComplete : Number between 0 and 100 indicating the "percentage complete" of the flashing process.
7171
// @text onFlashingStateChange
72-
virtual void OnFlashingStateChange (const uint32_t percentageComplete )= 0;
72+
virtual void OnFlashingStateChange (const uint32_t percentageComplete ) {};
7373

7474
};
7575

apis/OCIContainer/IOCIContainer.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ struct EXTERNAL IOCIContainer : virtual public Core::IUnknown {
3131
enum { ID = ID_OCICONTAINER };
3232

3333
enum ContainerState : uint8_t {
34-
Invalid = 0,
35-
Starting = 1,
36-
Running = 2,
37-
Stopping = 3,
38-
Paused = 4,
39-
Stopped = 5,
40-
Hibernating = 6,
41-
Hibernated = 7,
42-
Awakening = 8
34+
INVALID = 0,
35+
STARTING = 1,
36+
RUNNING = 2,
37+
STOPPING = 3,
38+
PAUSED = 4,
39+
STOPPED = 5,
40+
HIBERNATING = 6,
41+
HIBERNATED = 7,
42+
AWAKENING = 8
4343
};
4444

4545
// @event

apis/SystemMode/IDeviceOptimizeStateActivator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Exchange {
3030

3131
/// Requests the component to asynchronously transition to the new state.
3232
/// @param[in] newState The new target state to transition to.
33-
virtual void Request(const string& newState /* @in @text newState*/) = 0;
33+
virtual Core::hresult Request(const string& newState /* @in @text newState*/) = 0;
3434
};
3535
}
3636
}

apis/SystemMode/ISystemMode.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,15 @@ struct EXTERNAL ISystemMode : virtual public Core::IUnknown {
6161
// @brief To put client plugin entry in map.
6262
// @param[in] callsign callsign of client.
6363
// @param[in] systemMode The system mode.
64-
// @returns uint32_t
65-
virtual uint32_t ClientActivated(const string& callsign /* @in @text callsign*/ ,const string& systemMode) = 0;
64+
// @returns Core::hresult
65+
virtual Core::hresult ClientActivated(const string& callsign /* @in @text callsign*/ ,const string& systemMode) = 0;
6666

6767
// @text clientDeactivated
6868
// @brief To put client plugin entry in map.
6969
// @param[in] callsign callsign of client.
7070
// @param[in] systemMode The system mode.
71-
// @returns uint32_t
72-
virtual uint32_t ClientDeactivated(const string& callsign /* @in @text callsign*/, const string& systemMode) = 0;
71+
// @returns Core::hresult
72+
virtual Core::hresult ClientDeactivated(const string& callsign /* @in @text callsign*/, const string& systemMode) = 0;
7373
};
7474
} // namespace Exchange
7575
} // namespace WPEFramework

docs/apis/UserSettingsPlugin.md

Lines changed: 120 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<a name="UserSettings_Plugin"></a>
33
# UserSettings Plugin
44

5-
**Version: [1.0.0]()**
5+
**Version: [2.3.0](https://github.com/rdkcentral/rdkservices/blob/main/UserSettings/CHANGELOG.md)**
66

77
A org.rdk.UserSettings plugin for Thunder framework.
88

@@ -17,7 +17,7 @@ A org.rdk.UserSettings plugin for Thunder framework.
1717
<a name="Abbreviation,_Acronyms_and_Terms"></a>
1818
# Abbreviation, Acronyms and Terms
1919

20-
[[Refer to this link](overview/aat.md)]
20+
[[Refer to this link](userguide/aat.md)]
2121

2222
<a name="Description"></a>
2323
# Description
@@ -64,6 +64,7 @@ org.rdk.UserSettings interface methods:
6464
| [setVoiceGuidance](#setVoiceGuidance) | Sets voiceGuidance |
6565
| [setVoiceGuidanceRate](#setVoiceGuidanceRate) | Sets voiceGuidanceRate |
6666
| [setVoiceGuidanceHints](#setVoiceGuidanceHints) | Sets voiceGuidanceHints ON/OFF |
67+
| [setContentPin](#setContentPin) | Setting ContentPin |
6768
| [getAudioDescription](#getAudioDescription) | Returns Audio Description |
6869
| [getPreferredAudioLanguages](#getPreferredAudioLanguages) | Returns Preferred Audio Languages |
6970
| [getPresentationLanguage](#getPresentationLanguage) | Getting Presentation Languages |
@@ -83,6 +84,7 @@ org.rdk.UserSettings interface methods:
8384
| [getVoiceGuidanceHints](#getVoiceGuidanceHints) | Gets the current voiceGuidanceHints setting |
8485
| [getMigrationState](#getMigrationState) | Gets the migration state of the respective key |
8586
| [getMigrationStates](#getMigrationStates) | Gets the migration state of all the defined keys |
87+
| [getContentPin](#getContentPin) | Returns ContentPin |
8688

8789

8890
<a name="setAudioDescription"></a>
@@ -901,6 +903,54 @@ Sets voiceGuidanceHints ON/OFF. Whether Voice Guidance hints setting is switched
901903
}
902904
```
903905

906+
<a name="setContentPin"></a>
907+
## *setContentPin*
908+
909+
Setting ContentPin.
910+
911+
### Events
912+
913+
| Event | Description |
914+
| :-------- | :-------- |
915+
| [onContentPinChanged](#onContentPinChanged) | Triggered when the ContentPin changes. |
916+
### Parameters
917+
918+
| Name | Type | Description |
919+
| :-------- | :-------- | :-------- |
920+
| params | object | |
921+
| params.contentPin | string | contentPin |
922+
923+
### Result
924+
925+
| Name | Type | Description |
926+
| :-------- | :-------- | :-------- |
927+
| result | string | On success null will be returned |
928+
929+
### Example
930+
931+
#### Request
932+
933+
```json
934+
{
935+
"jsonrpc": "2.0",
936+
"id": 42,
937+
"method": "org.rdk.UserSettings.setContentPin",
938+
"params": {
939+
"contentPin": "1234"
940+
}
941+
}
942+
```
943+
944+
#### Response
945+
946+
```json
947+
{
948+
"jsonrpc": "2.0",
949+
"id": 42,
950+
"result": "null"
951+
}
952+
```
953+
904954
<a name="getAudioDescription"></a>
905955
## *getAudioDescription*
906956

@@ -1664,8 +1714,8 @@ This method takes no parameters.
16641714
| :-------- | :-------- | :-------- |
16651715
| result | array | migration state of all the defined keys |
16661716
| result[#] | object | Keys and it's migration states |
1667-
| result[#].key | string | key of the property |
1668-
| result[#].requiresMigration | boolean | Migration State Of the Property |
1717+
| result[#]?.key | string | <sup>*(optional)*</sup> key of the property |
1718+
| result[#]?.requiresMigration | boolean | <sup>*(optional)*</sup> migration state of the property |
16691719

16701720
### Example
16711721

@@ -1694,6 +1744,47 @@ This method takes no parameters.
16941744
}
16951745
```
16961746

1747+
<a name="getContentPin"></a>
1748+
## *getContentPin*
1749+
1750+
Returns ContentPin.
1751+
1752+
### Events
1753+
1754+
No Events
1755+
1756+
### Parameters
1757+
1758+
This method takes no parameters.
1759+
1760+
### Result
1761+
1762+
| Name | Type | Description |
1763+
| :-------- | :-------- | :-------- |
1764+
| result | string | contentPin |
1765+
1766+
### Example
1767+
1768+
#### Request
1769+
1770+
```json
1771+
{
1772+
"jsonrpc": "2.0",
1773+
"id": 42,
1774+
"method": "org.rdk.UserSettings.getContentPin"
1775+
}
1776+
```
1777+
1778+
#### Response
1779+
1780+
```json
1781+
{
1782+
"jsonrpc": "2.0",
1783+
"id": 42,
1784+
"result": "1234"
1785+
}
1786+
```
1787+
16971788
<a name="Notifications"></a>
16981789
# Notifications
16991790

@@ -1722,6 +1813,7 @@ org.rdk.UserSettings interface events:
17221813
| [onVoiceGuidanceChanged](#onVoiceGuidanceChanged) | Triggered after the voice guidance enabled settings changes |
17231814
| [onVoiceGuidanceRateChanged](#onVoiceGuidanceRateChanged) | Triggered after the voice guidance rate changed |
17241815
| [onVoiceGuidanceHintsChanged](#onVoiceGuidanceHintsChanged) | Triggered after the voice guidance hints changes |
1816+
| [onContentPinChanged](#onContentPinChanged) | Triggered after the ContentPin changes (see `setContentPin`) |
17251817

17261818

17271819
<a name="onAudioDescriptionChanged"></a>
@@ -2132,3 +2224,27 @@ Triggered after the voice guidance hints changes.(see `SetVoiceGuidanceHints`).
21322224
}
21332225
```
21342226

2227+
<a name="onContentPinChanged"></a>
2228+
## *onContentPinChanged*
2229+
2230+
Triggered after the ContentPin changes (see `setContentPin`).
2231+
2232+
### Parameters
2233+
2234+
| Name | Type | Description |
2235+
| :-------- | :-------- | :-------- |
2236+
| params | object | |
2237+
| params.contentPin | string | contentPin |
2238+
2239+
### Example
2240+
2241+
```json
2242+
{
2243+
"jsonrpc": "2.0",
2244+
"method": "client.events.onContentPinChanged",
2245+
"params": {
2246+
"contentPin": "1234"
2247+
}
2248+
}
2249+
```
2250+

tools/json_generator/output/UserSettings/UserSettings.json

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@
4646
"type": "number",
4747
"example": 0.1
4848
},
49-
"MigrationStates": {
49+
"contentPin": {
50+
"summary": "contentPin",
51+
"type": "string",
52+
"example": "1234"
53+
},
54+
"MigrationStates": {
5055
"summary": "Keys and it's migration states",
5156
"type": "object",
5257
"properties": {
@@ -56,7 +61,7 @@
5661
"example": "PREFERRED_AUDIO_LANGUAGES"
5762
},
5863
"requiresMigration": {
59-
"summary": "The name of the USB device",
64+
"summary": "migration state of the property",
6065
"type": "boolean",
6166
"example": true
6267
}
@@ -408,6 +413,25 @@
408413
"example": "null"
409414
}
410415
},
416+
"setContentPin": {
417+
"summary": "Setting ContentPin.",
418+
"events": {
419+
"onContentPinChanged" : "Triggered when the ContentPin changes."
420+
},
421+
"params": {
422+
"type": "object",
423+
"properties": {
424+
"contentPin": {
425+
"$ref": "#/definitions/contentPin"
426+
}
427+
}
428+
},
429+
"result": {
430+
"summary": "On success null will be returned",
431+
"type": "string",
432+
"example": "null"
433+
}
434+
},
411435
"getAudioDescription":
412436
{
413437
"summary": "Returns Audio Description.",
@@ -545,7 +569,7 @@
545569
"example": "VOICE_GUIDANCE_RATE"
546570
}
547571
},
548-
"required": ["deviceName"]
572+
"required": ["key"]
549573
},
550574
"result": {
551575
"summary": "migration state of the respective key true/false",
@@ -563,6 +587,12 @@
563587
"$ref": "#/definitions/MigrationStates"
564588
}
565589
}
590+
},
591+
"getContentPin":{
592+
"summary": "Returns ContentPin.",
593+
"result": {
594+
"$ref": "#/definitions/contentPin"
595+
}
566596
}
567597
},
568598
"events": {
@@ -833,8 +863,21 @@
833863
},
834864
"required": [ "hints" ]
835865
}
836-
}
866+
},
867+
"onContentPinChanged": {
868+
"summary": "Triggered after the ContentPin changes (see `setContentPin`)",
869+
"params": {
870+
"type": "object",
871+
"properties": {
872+
"contentPin": {
873+
"$ref": "#/definitions/contentPin"
874+
}
875+
},
876+
"required": [
877+
"contentPin"
878+
]
879+
}
880+
}
837881
}
838882
}
839883

840-

0 commit comments

Comments
 (0)