Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 06:22:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I0083953e,Icc8df58d,I84e828ed,I58aff832 am: bbee11bafa

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2460228

Change-Id: I13237c71781d01124279c0bfacbb7d6e9a05b3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nathalie Le Clair
2023-03-02 08:09:22 +00:00
committed by Automerger Merge Worker
parent f2b5038372 bbee11bafa
commit 0f1a1a6ae2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tv/hdmi/connection/aidl/default/HdmiConnectionMock.cpp
View File

@@ -70,16 +70,21 @@ ScopedAStatus HdmiConnectionMock::setCallback(
}
ScopedAStatus HdmiConnectionMock::setHpdSignal(HpdSignal signal, int32_t portId) {
if (mHdmiThreadRun) {
mHpdSignal.at(portId - 1) = signal;
return ScopedAStatus::ok();
} else {
if (portId > mTotalPorts || portId < 1) {
return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
if (!mHdmiThreadRun) {
return ScopedAStatus::fromServiceSpecificError(
static_cast<int32_t>(Result::FAILURE_INVALID_STATE));
}
mHpdSignal.at(portId - 1) = signal;
return ScopedAStatus::ok();
}
ScopedAStatus HdmiConnectionMock::getHpdSignal(int32_t portId, HpdSignal* _aidl_return) {
if (portId > mTotalPorts || portId < 1) {
return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
*_aidl_return = mHpdSignal.at(portId - 1);
return ScopedAStatus::ok();
}
@@ -123,7 +128,7 @@ void HdmiConnectionMock::handleHotplugMessage(unsigned char* msgBuf) {
bool connected = ((msgBuf[3]) & 0xf) > 0;
int32_t portId = static_cast<uint32_t>(msgBuf[0] & 0xf);
if (portId > static_cast<int32_t>(mPortInfos.size())) {
if (portId > static_cast<int32_t>(mPortInfos.size()) || portId < 1) {
ALOGD("[halimp_aidl] ignore hot plug message, id %x does not exist", portId);
return;
}