Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bbeb510 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge "Fix incorrect indexing"

parents 6d6cda07 28318a3a

tv/hdmi/connection/aidl/default/HdmiConnectionMock.cpp

+4 −4
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ ScopedAStatus HdmiConnectionMock::getPortInfo(std::vector<HdmiPortInfo>* _aidl_r 
ScopedAStatus HdmiConnectionMock::isConnected(int32_t portId, bool* _aidl_return) {

    // Maintain port connection status and update on hotplug event

    if (portId <= mTotalPorts && portId >= 1) {

        *_aidl_return = mPortConnectionStatus[portId];

        *_aidl_return = mPortConnectionStatus.at(portId - 1);

    } else {

        *_aidl_return = false;

    }
@@ -130,10 +130,10 @@ void HdmiConnectionMock::handleHotplugMessage(unsigned char* msgBuf) { 


    ALOGD("[halimp_aidl] hot plug port id %x, is connected %x", (msgBuf[0] & 0xf),

          (msgBuf[3] & 0xf));

    mPortConnectionStatus[portId] = connected;

    if (mPortInfos[portId].type == HdmiPortType::OUTPUT) {

    mPortConnectionStatus.at(portId - 1) = connected;

    if (mPortInfos.at(portId - 1).type == HdmiPortType::OUTPUT) {

        mPhysicalAddress = (connected ? 0xffff : ((msgBuf[1] << 8) | (msgBuf[2])));

        mPortInfos[portId].physicalAddress = mPhysicalAddress;

        mPortInfos.at(portId - 1).physicalAddress = mPhysicalAddress;

        ALOGD("[halimp_aidl] hot plug physical address %x", mPhysicalAddress);

    }

tv/hdmi/earc/aidl/default/EArcMock.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ScopedAStatus EArcMock::isEArcEnabled(bool* _aidl_return) { 
ScopedAStatus EArcMock::getState(int32_t portId, IEArcStatus* _aidl_return) {

    // Maintain port connection status and update on hotplug event

    if (portId <= mTotalPorts && portId >= 1) {

        *_aidl_return = mPortStatus[portId];

        *_aidl_return = mPortStatus.at(portId - 1);

    } else {

        return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

    }
@@ -65,7 +65,7 @@ ScopedAStatus EArcMock::getState(int32_t portId, IEArcStatus* _aidl_return) { 
ScopedAStatus EArcMock::getLastReportedAudioCapabilities(int32_t portId,

                                                         std::vector<uint8_t>* _aidl_return) {

    if (portId <= mTotalPorts && portId >= 1) {

        *_aidl_return = mCapabilities[portId];

        *_aidl_return = mCapabilities.at(portId - 1);

    } else {

        return ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);

    }