Skip to content

Commit bcbabdd

Browse files
Merge pull request #249 from rdkcentral/develop
IProvisioning.h Interface header not following coding guidelines
2 parents c7dd770 + 93e39c2 commit bcbabdd

File tree

8 files changed

+228
-51
lines changed

8 files changed

+228
-51
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@ 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.0](https://github.com/rdkcentral/entservices-apis/compare/1.4.2...1.5.0)
8+
9+
- DELIA-67834 : Added privacyMode related calls. [`#133`](https://github.com/rdkcentral/entservices-apis/pull/133)
10+
- Merge tag '1.4.2' into develop [`4ebfb21`](https://github.com/rdkcentral/entservices-apis/commit/4ebfb219ea129bfe695290c85bcd5cecee5a0a7c)
11+
712
#### [1.4.2](https://github.com/rdkcentral/entservices-apis/compare/1.4.1...1.4.2)
813

14+
> 28 May 2025
15+
916
- RDKEMW-1016 Add COM-RPC support to LEDControl plugin [`#157`](https://github.com/rdkcentral/entservices-apis/pull/157)
17+
- RDKEMW-1016 - Changelog updates for 1.4.2 [`1449587`](https://github.com/rdkcentral/entservices-apis/commit/1449587865c3b124b89a6b7af3ba69fa677318e8)
1018
- Merge tag '1.4.1' into develop [`e2e96ce`](https://github.com/rdkcentral/entservices-apis/commit/e2e96ce04efecaa6f3259c22bcd52320a68e7e91)
1119

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

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/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
};

apis/PackageManager/IAppPackageManager.h

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,32 @@
66

77
namespace WPEFramework {
88
namespace Exchange {
9+
910
#ifndef RUNTIME_CONFIG
1011
struct RuntimeConfig {
1112
bool dial;
1213
bool wanLanAccess;
1314
bool thunder;
1415
int32_t systemMemoryLimit;
1516
int32_t gpuMemoryLimit;
16-
std::string envVars;
17+
std::string envVariables;
1718
uint32_t userId;
1819
uint32_t groupId;
1920
uint32_t dataImageSize;
2021

2122
bool resourceManagerClientEnabled;
2223
std::string dialId;
2324
std::string command;
24-
uint32_t appType;
25+
std::string appType;
2526
std::string appPath;
2627
std::string runtimePath;
2728

29+
std::string logFilePath;
30+
uint32_t logFileMaxSize;
31+
std::string logLevels; //json array of strings
32+
bool mapi;
33+
std::string fkpsFiles; //json array of strings
34+
2835
std::string fireboltVersion;
2936
bool enableDebugger;
3037
};
@@ -75,15 +82,27 @@ namespace Exchange {
7582
virtual Core::hresult Deinitialize(PluginHost::IShell* service) = 0;
7683

7784

85+
struct Options {
86+
// @brief Priority
87+
bool priority;
88+
// @brief Retries
89+
uint32_t retries;
90+
// @brief RateLimit
91+
uint64_t rateLimit;
92+
};
93+
94+
struct DownloadId {
95+
string downloadId;
96+
};
97+
7898
// @brief Download
7999
// @text download
80100
// @param url: Download url
101+
// @param options: Download options
81102
virtual Core::hresult Download(
82103
const string &url,
83-
const bool priority /* @optional */,
84-
const uint32_t retries /* @optional */,
85-
const uint64_t rateLimit /* @optional */,
86-
string &downloadId /* @out */) = 0;
104+
const Options &options,
105+
DownloadId &downloadId /* @out */) = 0;
87106

88107
// @brief Pause
89108
// @text pause
@@ -105,18 +124,22 @@ namespace Exchange {
105124
// @param fileLocator: FileLocator
106125
virtual Core::hresult Delete(const string &fileLocator) = 0;
107126

127+
struct Percent {
128+
uint8_t percent;
129+
};
130+
108131
// @brief Delete
109132
// @text progress
110133
// @param downloadId: Download id
111134
virtual Core::hresult Progress(
112135
const string &downloadId,
113-
uint8_t &percent /* @out */) = 0;
136+
Percent &percent /* @out */) = 0;
114137

115138
// @brief GetStorageDetails
116139
// @text getStorageDetails
117140
virtual Core::hresult GetStorageDetails(
118-
uint32_t &quotaKB /* @out */,
119-
uint32_t &usedKB /* @out */) = 0;
141+
uint32_t &quotaKb /* @out */,
142+
uint32_t &usedKb /* @out */) = 0;
120143

121144
// @brief RateLimit
122145
// @text rateLimit
@@ -129,16 +152,18 @@ namespace Exchange {
129152
struct EXTERNAL IPackageInstaller : virtual public Core::IUnknown {
130153
enum { ID = ID_PACKAGE_INSTALLER };
131154

132-
enum PackageLifecycleState : uint8_t {
133-
INSTALLING,
155+
enum InstallState : uint8_t{
156+
INSTALLING, // XXX: necessary ?!
134157
INSTALLATION_BLOCKED,
158+
INSTALL_FAILURE,
135159
INSTALLED,
136-
UNINSTALLING,
160+
UNINSTALLING, // XXX: necessary ?!
161+
UNINSTALL_FAILURE,
137162
UNINSTALLED
138163
};
139164

140165
enum FailReason : uint8_t {
141-
NONE,
166+
NONE, // XXX: Not in HLA
142167
SIGNATURE_VERIFICATION_FAILURE,
143168
PACKAGE_MISMATCH_FAILURE,
144169
INVALID_METADATA_FAILURE,
@@ -149,8 +174,8 @@ namespace Exchange {
149174
string packageId;
150175
// @brief Version
151176
string version;
152-
// @brief PackageState
153-
PackageLifecycleState packageState;
177+
// @brief state
178+
InstallState state;
154179
// @brief Digest
155180
string digest;
156181
// @brief SizeKb
@@ -194,7 +219,7 @@ namespace Exchange {
194219
const string &version,
195220
IPackageInstaller::IKeyValueIterator* const& additionalMetadata,
196221
const string &fileLocator,
197-
FailReason &reason /* @out */) = 0;
222+
FailReason &failReason /* @out */) = 0;
198223

199224
// @brief Uninstall
200225
// @text uninstall
@@ -225,7 +250,7 @@ namespace Exchange {
225250
virtual Core::hresult PackageState(
226251
const string &packageId,
227252
const string &version,
228-
PackageLifecycleState &state /* @out */
253+
InstallState &state /* @out */
229254
) = 0;
230255
};
231256

0 commit comments

Comments
 (0)