Skip to content

Commit 1480b3c

Browse files
committed
Merge branch 'release/1.6.0' into main
2 parents 406707b + 680e42f commit 1480b3c

File tree

5 files changed

+47
-52
lines changed

5 files changed

+47
-52
lines changed

.github/workflows/Validate_Interface_headers_incremental.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,25 @@ jobs:
2525
git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1
2626
git diff --name-only origin/${{ github.event.pull_request.base.ref }} > changed_files.txt
2727
28+
- name: Filter only existing changed files
29+
id: filter_existing
30+
run: |
31+
touch existing_files.txt
32+
while IFS= read -r file; do
33+
if [ -f "$file" ]; then
34+
echo "$file" >> existing_files.txt
35+
else
36+
echo " $file file has been removed in your PR,hence skipping validation for the removed file"
37+
fi
38+
done < changed_files.txt
39+
2840
- name: Run validation script
2941
run: |
30-
python .github/workflows/validate_interface_headers_incremental.py changed_files.txt
42+
if [ -s existing_files.txt ]; then
43+
python .github/workflows/validate_interface_headers_incremental.py existing_files.txt
44+
else
45+
echo "No valid changed files to validate."
46+
fi
3147
3248
- name: Remove changed_files.txt
3349
run: |

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,21 @@ 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.6.0](https://github.com/rdkcentral/entservices-apis/compare/1.5.1...1.6.0)
8+
9+
- IProvisioning.h Interface header not following coding guidelines [`#237`](https://github.com/rdkcentral/entservices-apis/pull/237)
10+
- IProvisioning.h Interface header not following coding guidelines [`#257`](https://github.com/rdkcentral/entservices-apis/pull/257)
11+
- RDKEMW-3385: Implement Caching in New PackageManager [`#248`](https://github.com/rdkcentral/entservices-apis/pull/248)
12+
- IProvisioning.h Interface header not following coding guidelines [`#249`](https://github.com/rdkcentral/entservices-apis/pull/249)
13+
- Merge tag '1.5.1' into develop [`2b988b6`](https://github.com/rdkcentral/entservices-apis/commit/2b988b65d2d7eae1c22538fa2475a1a04eb70143)
14+
715
#### [1.5.1](https://github.com/rdkcentral/entservices-apis/compare/1.5.0...1.5.1)
816

17+
> 6 June 2025
18+
919
- RDK-56578 : Changed deviceType from tv to IpTv [`#156`](https://github.com/rdkcentral/entservices-apis/pull/156)
1020
- RDKEMW-4872: lifecycle2.0 integration [`#242`](https://github.com/rdkcentral/entservices-apis/pull/242)
21+
- 1.5.1 release changelog updates [`b7bbff3`](https://github.com/rdkcentral/entservices-apis/commit/b7bbff3308e54efbb5db7d56c9548e8191bae382)
1122
- Merge tag '1.5.0' into develop [`a7793b3`](https://github.com/rdkcentral/entservices-apis/commit/a7793b312ddb00c8009d34f52031fd6e7f3b5646)
1223

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

apis/DeviceProvisioning/IProvisioning.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

apis/Ids.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ namespace Exchange {
7575
ID_CONTENTDECRYPTION = ID_ENTOS_OFFSET + 0x030,
7676
ID_CONTENTDECRYPTION_NOTIFICATION = ID_CONTENTDECRYPTION + 1,
7777

78-
ID_PROVISIONING = ID_ENTOS_OFFSET + 0x040,
79-
ID_PROVISIONING_NOTIFICATION = ID_PROVISIONING + 1,
80-
8178
ID_CAPTURE = ID_ENTOS_OFFSET + 0x050,
8279

8380
ID_PACKAGER = ID_ENTOS_OFFSET + 0x060,
@@ -246,7 +243,8 @@ namespace Exchange {
246243
ID_PACKAGE_INFO_ITERATOR = ID_APP_PACKAGE_MANAGER + 7,
247244
ID_PACKAGE_ITERATOR = ID_APP_PACKAGE_MANAGER + 8,
248245
ID_PACKAGE_KEY_VALUE_ITERATOR = ID_APP_PACKAGE_MANAGER + 9,
249-
246+
ID_PACKAGE_LOCK_ITERATOR = ID_APP_PACKAGE_MANAGER + 10,
247+
250248
ID_STORAGEMANAGER = ID_ENTOS_OFFSET + 0x310,
251249

252250
ID_AUTHSERVICE = ID_ENTOS_OFFSET + 0x320,
@@ -263,12 +261,12 @@ namespace Exchange {
263261

264262
ID_SCREEN_CAPTURE = ID_ENTOS_OFFSET + 0x360,
265263
ID_SCREEN_CAPTURE_NOTIFICATION = ID_SCREEN_CAPTURE + 1,
266-
264+
267265
ID_DEVICE_DIAGNOSTICS = ID_ENTOS_OFFSET + 0x370,
268266
ID_DEVICE_DIAGNOSTICS_PARAM_LIST_ITERATOR = ID_DEVICE_DIAGNOSTICS + 1,
269267
ID_DEVICE_DIAGNOSTICS_NOTIFICATION = ID_DEVICE_DIAGNOSTICS + 2,
270268

271-
269+
272270
ID_WAREHOUSE = ID_ENTOS_OFFSET + 0x380,
273271
ID_WAREHOUSE_NOTIFICATION = ID_WAREHOUSE + 1,
274272

apis/PackageManager/IAppPackageManager.h

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ namespace Exchange {
168168
PACKAGE_MISMATCH_FAILURE,
169169
INVALID_METADATA_FAILURE,
170170
PERSISTENCE_FAILURE
171-
};
171+
};
172172
struct Package {
173173
// @brief PackageId
174174
string packageId;
@@ -243,6 +243,11 @@ namespace Exchange {
243243
RuntimeConfig &configMetadata /* @out */
244244
) = 0;
245245

246+
struct PackageStateResponse {
247+
InstallState state;
248+
};
249+
// XXX: update vvv
250+
246251
// @brief PackageState
247252
// @text packageState
248253
// @param packageId: Package Id
@@ -266,6 +271,14 @@ namespace Exchange {
266271
LAUNCH
267272
};
268273

274+
struct EXTERNAL AdditionalLock {
275+
// @brief PackageId
276+
string packageId;
277+
// @brief Version
278+
string version;
279+
};
280+
using ILockIterator = RPC::IIteratorType<AdditionalLock, ID_PACKAGE_LOCK_ITERATOR>;
281+
269282
// @brief Lock
270283
// @text lock
271284
// @param packageId: Package Id
@@ -282,7 +295,7 @@ namespace Exchange {
282295
uint32_t &lockId /* @out */,
283296
string &unpackedPath /* @out */,
284297
RuntimeConfig &configMetadata /* @out */,
285-
string &appMetadata /* @out */
298+
IPackageHandler::ILockIterator*& appMetadata /* @out */
286299
// XXX: appContextPath ?!
287300
) = 0;
288301

0 commit comments

Comments
 (0)