Skip to content

Commit cf9599f

Browse files
neethuas379neethuas379
authored
Merge branch 'develop' into feature/RDKEMW-3529-VRR_support
2 parents e021a08 + e0c9a17 commit cf9599f

File tree

9 files changed

+232
-57
lines changed

9 files changed

+232
-57
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,18 @@ 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.5.1](https://github.com/rdkcentral/entservices-apis/compare/1.5.0...1.5.1)
8+
9+
- RDK-56578 : Changed deviceType from tv to IpTv [`#156`](https://github.com/rdkcentral/entservices-apis/pull/156)
10+
- RDKEMW-4872: lifecycle2.0 integration [`#242`](https://github.com/rdkcentral/entservices-apis/pull/242)
11+
- Merge tag '1.5.0' into develop [`a7793b3`](https://github.com/rdkcentral/entservices-apis/commit/a7793b312ddb00c8009d34f52031fd6e7f3b5646)
12+
713
#### [1.5.0](https://github.com/rdkcentral/entservices-apis/compare/1.4.2...1.5.0)
814

15+
> 3 June 2025
16+
917
- DELIA-67834 : Added privacyMode related calls. [`#133`](https://github.com/rdkcentral/entservices-apis/pull/133)
18+
- 1.5.0 release changelog updates [`54d9283`](https://github.com/rdkcentral/entservices-apis/commit/54d928300f43292d21fb3d22236b29553d425c12)
1019
- Merge tag '1.4.2' into develop [`4ebfb21`](https://github.com/rdkcentral/entservices-apis/commit/4ebfb219ea129bfe695290c85bcd5cecee5a0a7c)
1120

1221
#### [1.4.2](https://github.com/rdkcentral/entservices-apis/compare/1.4.1...1.4.2)

‎apis/AppManager/IAppManager.h‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,68 @@
2323

2424
namespace WPEFramework {
2525
namespace Exchange {
26+
27+
#ifndef RUNTIME_CONFIG
28+
struct RuntimeConfig
29+
{
30+
bool dial;
31+
bool wanLanAccess;
32+
bool thunder;
33+
int32_t systemMemoryLimit;
34+
int32_t gpuMemoryLimit;
35+
std::string envVariables;
36+
uint32_t userId;
37+
uint32_t groupId;
38+
uint32_t dataImageSize;
39+
40+
bool resourceManagerClientEnabled;
41+
std::string dialId;
42+
std::string command;
43+
std::string appType;
44+
std::string appPath;
45+
std::string runtimePath;
46+
47+
std::string logFilePath;
48+
uint32_t logFileMaxSize;
49+
std::string logLevels; //json array of strings
50+
bool mapi;
51+
std::string fkpsFiles; //json array of strings
52+
53+
std::string fireboltVersion;
54+
bool enableDebugger;
55+
string unpackedPath;
56+
};
57+
#define RUNTIME_CONFIG
58+
#endif
59+
2660
// @json 1.0.0 @text:keep
2761
struct EXTERNAL IAppManager : virtual public Core::IUnknown {
2862
enum { ID = ID_APPMANAGER };
2963

3064
enum AppLifecycleState : uint8_t {
31-
APP_STATE_UNKNOWN = 0 /* @text APP_STATE_UNKNOWN */,
32-
APP_STATE_RUNNING = 1 /* @text APP_STATE_RUNNING */,
33-
APP_STATE_ACTIVE = 2 /* @text APP_STATE_ACTIVE */,
34-
APP_STATE_SUSPENDED = 3 /* @text APP_STATE_SUSPENDED */,
35-
APP_STATE_HIBERNATED = 4 /* @text APP_STATE_HIBERNATED */,
36-
APP_STATE_TERMINATED = 5 /* @text APP_STATE_TERMINATED */
65+
APP_STATE_UNKNOWN = 0 /* @text APP_STATE_UNKNOWN */,
66+
APP_STATE_UNLOADED = 1 /* @text APP_STATE_UNLOADED */,
67+
APP_STATE_LOADING = 2 /* @text APP_STATE_LOADING */,
68+
APP_STATE_INITIALIZING = 3 /* @text APP_STATE_INITIALIZING */,
69+
APP_STATE_PAUSED = 4 /* @text APP_STATE_PAUSED */,
70+
APP_STATE_RUNNING = 5 /* @text APP_STATE_RUNNING */,
71+
APP_STATE_ACTIVE = 6 /* @text APP_STATE_ACTIVE */,
72+
APP_STATE_SUSPENDED = 7 /* @text APP_STATE_SUSPENDED */,
73+
APP_STATE_HIBERNATED = 8 /* @text APP_STATE_HIBERNATED */,
74+
APP_STATE_TERMINATED = 9 /* @text APP_STATE_TERMINATED */
3775
};
3876

3977
enum AppErrorReason : uint8_t {
40-
APP_ERROR_UNKNOWN = 0 /* @text APP_ERROR_UNKNOWN */,
41-
APP_ERROR_STATE_TIMEOUT = 1 /* @text APP_ERROR_STATE_TIMEOUT */,
42-
APP_ERROR_ABORT = 2 /* @text APP_ERROR_ABORT */
78+
APP_ERROR_NONE = 0 /* @text APP_ERROR_NONE */,
79+
APP_ERROR_UNKNOWN = 1 /* @text APP_ERROR_UNKNOWN */,
80+
APP_ERROR_STATE_TIMEOUT = 2 /* @text APP_ERROR_STATE_TIMEOUT */,
81+
APP_ERROR_ABORT = 3 /* @text APP_ERROR_ABORT */
4382
};
4483

45-
// @event
84+
// @event
4685
struct EXTERNAL INotification : virtual public Core::IUnknown {
4786
enum { ID = ID_APPMANAGER_NOTIFICATION };
48-
87+
4988
// @text onAppInstalled
5089
// @brief Triggered whenever the App is installed.
5190
// @param appId:App identifier for the application.

‎apis/DeviceInfo/DeviceInfo.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
"devicetype": {
128128
"type": "string",
129129
"enum": [
130-
"tv",
130+
"IpTv",
131131
"IpStb",
132132
"QamIpStb"
133133
],

‎apis/Ids.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ namespace Exchange {
246246
ID_PACKAGE_INFO_ITERATOR = ID_APP_PACKAGE_MANAGER + 7,
247247
ID_PACKAGE_ITERATOR = ID_APP_PACKAGE_MANAGER + 8,
248248
ID_PACKAGE_KEY_VALUE_ITERATOR = ID_APP_PACKAGE_MANAGER + 9,
249-
249+
ID_PACKAGE_LOCK_ITERATOR = ID_APP_PACKAGE_MANAGER + 10,
250+
250251
ID_STORAGEMANAGER = ID_ENTOS_OFFSET + 0x310,
251252

252253
ID_AUTHSERVICE = ID_ENTOS_OFFSET + 0x320,
@@ -263,12 +264,12 @@ namespace Exchange {
263264

264265
ID_SCREEN_CAPTURE = ID_ENTOS_OFFSET + 0x360,
265266
ID_SCREEN_CAPTURE_NOTIFICATION = ID_SCREEN_CAPTURE + 1,
266-
267+
267268
ID_DEVICE_DIAGNOSTICS = ID_ENTOS_OFFSET + 0x370,
268269
ID_DEVICE_DIAGNOSTICS_PARAM_LIST_ITERATOR = ID_DEVICE_DIAGNOSTICS + 1,
269270
ID_DEVICE_DIAGNOSTICS_NOTIFICATION = ID_DEVICE_DIAGNOSTICS + 2,
270271

271-
272+
272273
ID_WAREHOUSE = ID_ENTOS_OFFSET + 0x380,
273274
ID_WAREHOUSE_NOTIFICATION = ID_WAREHOUSE + 1,
274275

‎apis/LifecycleManager/ILifecycleManager.h‎

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,38 +23,64 @@
2323

2424
namespace WPEFramework {
2525
namespace Exchange {
26+
27+
#ifndef RUNTIME_CONFIG
28+
struct RuntimeConfig {
29+
bool dial;
30+
bool wanLanAccess;
31+
bool thunder;
32+
int32_t systemMemoryLimit;
33+
int32_t gpuMemoryLimit;
34+
std::string envVariables;
35+
uint32_t userId;
36+
uint32_t groupId;
37+
uint32_t dataImageSize;
38+
39+
bool resourceManagerClientEnabled;
40+
std::string dialId;
41+
std::string command;
42+
std::string appType;
43+
std::string appPath;
44+
std::string runtimePath;
45+
46+
std::string logFilePath;
47+
uint32_t logFileMaxSize;
48+
std::string logLevels; //json array of strings
49+
bool mapi;
50+
std::string fkpsFiles; //json array of strings
51+
52+
std::string fireboltVersion;
53+
bool enableDebugger;
54+
string unpackedPath;
55+
};
56+
#define RUNTIME_CONFIG
57+
#endif
58+
2659
// @text:keep
2760
struct EXTERNAL ILifecycleManager : virtual public Core::IUnknown {
2861

2962
enum LifecycleState : uint8_t {
63+
UNLOADED,
3064
LOADING,
3165
INITIALIZING,
32-
RUNREQUESTED,
33-
RUNNING,
34-
ACTIVATEREQUESTED,
66+
PAUSED,
3567
ACTIVE,
36-
DEACTIVATEREQUESTED,
37-
SUSPENDREQUESTED,
3868
SUSPENDED,
39-
RESUMEREQUESTED,
40-
HIBERNATEREQUESTED,
4169
HIBERNATED,
42-
WAKEREQUESTED,
43-
TERMINATEREQUESTED,
4470
TERMINATING
4571
};
4672

4773
enum { ID = ID_LIFECYCLE_MANAGER };
4874

49-
// @event
75+
// @event
5076
struct EXTERNAL INotification : virtual public Core::IUnknown
5177
{
5278
enum { ID = ID_LIFECYCLE_MANAGER_NOTIFICATION };
53-
79+
5480
// @brief Notifies the change of state of application
5581
// @text onnAppStateChanged
5682
// @json:omit
57-
virtual void OnAppStateChanged(const string& appId, LifecycleState state, const string& errorReason) = 0;
83+
virtual void OnAppStateChanged(const string& appId, LifecycleState state, const string& errorReason) {};
5884
};
5985

6086
/** Register notification interface */
@@ -79,7 +105,7 @@ struct EXTERNAL ILifecycleManager : virtual public Core::IUnknown {
79105
// @json:omit
80106
// @text spawnApp
81107
// @brief Perform launching of application with window and runtime manager
82-
virtual Core::hresult SpawnApp(const string& appId /* @in */, const string& appPath /* @in */, const string& appConfig /* @in */, const string& runtimeAppId /* @in */, const string& runtimePath /* @in */, const string& runtimeConfig /* @in */, const string& launchIntent /* @in */, const string& environmentVars /* @in */, const bool enableDebugger /* @in */, const LifecycleState targetLifecycleState /* @in */, const string& launchArgs /* @in */, string& appInstanceId /* @out */, string& errorReason /* @out */, bool& success /* @out */) = 0;
108+
virtual Core::hresult SpawnApp(const string& appId /* @in */, const string& appPath /* @in */, const string& appConfig /* @in */, const string& runtimeAppId /* @in */, const string& runtimePath /* @in */, const string& runtimeConfig /* @in */, const string& launchIntent /* @in */, const string& environmentVars /* @in */, const bool enableDebugger /* @in */, const LifecycleState targetLifecycleState /* @in */, const RuntimeConfig& runtimeConfigObject /* @in */, const string& launchArgs /* @in */, string& appInstanceId /* @out */, string& errorReason /* @out */, bool& success /* @out */) = 0;
83109

84110
/** Get the list of loaded applications */
85111
// @json:omit

‎apis/LifecycleManager/ILifecycleManagerState.h‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
namespace WPEFramework {
2727
namespace Exchange {
28+
// @json 1.0.0 @text:keep
2829
struct EXTERNAL ILifecycleManagerState : virtual public Core::IUnknown {
2930

3031
enum AppCloseReason : uint8_t {
@@ -41,8 +42,13 @@ struct EXTERNAL ILifecycleManagerState : virtual public Core::IUnknown {
4142
enum { ID = ID_LIFECYCLE_MANAGER_STATE_NOTIFICATION };
4243

4344
/** Notifies the new state */
44-
// @json:omit
45+
// @text onAppLifecycleStateChanged
4546
// @brief Notifies the new state
47+
// @param appId:App identifier for the application.
48+
// @param appInstanceId:A numerical identifier for a specific instance of the application.
49+
// @param newState:The new state to transition the application.
50+
// @param oldState:The previous state of the application instance before the update.
51+
// @param navigationIntent:navigation intent during active state
4652
virtual void OnAppLifecycleStateChanged(const string& appId,
4753
const string& appInstanceId,
4854
const ILifecycleManager::LifecycleState oldState,
@@ -57,18 +63,23 @@ struct EXTERNAL ILifecycleManagerState : virtual public Core::IUnknown {
5763
virtual Core::hresult Unregister(INotification *notification) = 0;
5864

5965
/** Response api call to appInitializing API */
60-
// @json:omit
66+
// @text appReady
6167
// @brief Response api call to appInitializing API
68+
// @param appId:App identifier for the application.
6269
virtual Core::hresult AppReady(const string& appId /* @in */) = 0;
6370

6471
/** Response api call to appLifecycleStateChanged API */
65-
// @json:omit
72+
// @text stateChangeComplete
6673
// @brief Response api call to appLifecycleStateChanged API
74+
// @param appId:App identifier for the application.
75+
// @param stateChangedId: state changed identifier
6776
virtual Core::hresult StateChangeComplete(const string& appId /* @in */, const uint32_t stateChangedId /* @in */, const bool success /* @in */) = 0;
6877

6978
/** close the app */
70-
// @json:omit
79+
// @text closeApp
7180
// @brief close the app
81+
// @param appId:App identifier for the application.
82+
// @param closeReason: closed reason for application
7283
virtual Core::hresult CloseApp(const string& appId /* @in */, const AppCloseReason closeReason /* @in */) = 0;
7384

7485
};

0 commit comments

Comments
 (0)