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

Commit 113ea287 authored by Myles Watson's avatar Myles Watson
Browse files

H4: Return early if bytes_read is 0 

Bug: 198724141
Test: com.android.devicehealthchecks.SystemCheck
Tag: #testing
Change-Id: I8ef3a70b8a6ba33a7a9f6be660aa3958ca1bd047
parent 6411ea06

system/vendor_libs/linux/interface/h4_protocol.cc

+9 −1
Original line number Diff line number Diff line
@@ -97,7 +97,15 @@ void H4Protocol::OnDataReady(int fd) { 
        const size_t max_plen = 64*1024;

        hidl_vec<uint8_t> tpkt;

        tpkt.resize(max_plen);

        size_t bytes_read = TEMP_FAILURE_RETRY(read(fd, tpkt.data(), max_plen));

        ssize_t bytes_read = TEMP_FAILURE_RETRY(read(fd, tpkt.data(), max_plen));

        if (bytes_read == 0) {

            ALOGI("No bytes read");

            return;

        }

        if (bytes_read < 0) {

            ALOGW("error reading from UART (%s)", strerror(errno));

            return;

        }

        hci_packet_type_ = static_cast<HciPacketType>(tpkt.data()[0]);

        hci_packetizer_.CbHciPacket(tpkt.data()+1, bytes_read-1);

    }