Skip to content

Commit 0d7c03d

Browse files
committed
Merge branch 'release/1.0.11' into main
2 parents 9bdf158 + 85c0153 commit 0d7c03d

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,19 @@ 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.0.11](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.10...1.0.11)
8+
9+
- PowerManager Interface file modified [`#62`](https://github.com/rdkcentral/entservices-inputoutput/pull/62)
10+
- Update TestManager.py for removing frontpanel and hdcpprofile dependencies to execute testcases standalone [`#68`](https://github.com/rdkcentral/entservices-inputoutput/pull/68)
11+
- Merge tag '1.0.10' into develop [`7a54d8c`](https://github.com/rdkcentral/entservices-inputoutput/commit/7a54d8cdb9da6de8071c19c8efdf48e7ec5bba96)
12+
713
#### [1.0.10](https://github.com/rdkcentral/entservices-inputoutput/compare/1.0.9...1.0.10)
814

15+
> 23 April 2025
16+
917
- RDK-55554 Update return type [`#60`](https://github.com/rdkcentral/entservices-inputoutput/pull/60)
1018
- RDKEMW-3207 [OSCR SCAN] RDKE - entservices-testframework [`#61`](https://github.com/rdkcentral/entservices-inputoutput/pull/61)
19+
- RDK-55554 - Changelog updates for 1.0.10 [`36cea31`](https://github.com/rdkcentral/entservices-inputoutput/commit/36cea315c7be83b561012ea219fb78cbdd60f5d5)
1120
- Modifying L1-tests.yml L2-tests.yml [`fd0a678`](https://github.com/rdkcentral/entservices-inputoutput/commit/fd0a6783526fa0dd6d6541b31aeef4c2d8272fb5)
1221
- Merge tag '1.0.9' into develop [`668cc7c`](https://github.com/rdkcentral/entservices-inputoutput/commit/668cc7ce09864ac16e6c609cabbfcf94ae16faba)
1322

HdcpProfile/HdcpProfile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ namespace WPEFramework
306306

307307
void HdcpProfile::dsHdmiEventHandler(const char *owner, IARM_EventId_t eventId, void *data, size_t len)
308308
{
309-
uint32_t res = Core::ERROR_GENERAL;
309+
Core::hresult res = Core::ERROR_GENERAL;
310310
PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
311311
PowerState pwrStatePrev = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
312312

HdmiCecSink/HdmiCecSink.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ namespace WPEFramework
765765
m_arcStartStopTimer.connect( std::bind( &HdmiCecSink::arcStartStopTimerFunction, this ) );
766766
m_arcStartStopTimer.setSingleShot(true);
767767
// get power state:
768-
uint32_t res = Core::ERROR_GENERAL;
768+
Core::hresult res = Core::ERROR_GENERAL;
769769
PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
770770
PowerState pwrStatePrev = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
771771

HdmiCecSource/HdmiCecSourceImplementation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ namespace WPEFramework
398398
ASSERT(service != nullptr);
399399
PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
400400
PowerState pwrStatePrev = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
401-
uint32_t res = Core::ERROR_GENERAL;
401+
Core::hresult res = Core::ERROR_GENERAL;
402402
string msg;
403403
if (Utils::IARM::init()) {
404404
//Initialize cecEnableStatus to false in ctor

Tests/L2HALMockTests/Test_Framework/TestManager.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
import time
2626
sys.path.append("../TestCases")
2727
from HdmiCecSource import CecUtils
28-
from FrontPanel import FPUtils
29-
from HDCPProfile import HdcpUtils
3028
from Utilities import Utils, ReportGenerator
3129

3230
sys.path.append("Utilities")

helpers/frontpanel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ namespace WPEFramework
160160

161161
#if defined(HAS_API_POWERSTATE)
162162
{
163-
uint32_t res = Core::ERROR_GENERAL;
163+
Core::hresult res = Core::ERROR_GENERAL;
164164
PowerState pwrStateCur = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
165165
PowerState pwrStatePrev = WPEFramework::Exchange::IPowerManager::POWER_STATE_UNKNOWN;
166166
ASSERT (_powerManagerPlugin);

0 commit comments

Comments
 (0)