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

Commit 0fdeb09e authored by Jerry Zhang's avatar Jerry Zhang Committed by Gerrit Code Review
Browse files

Merge "Stop capturing mtp_event by reference in lambda"

parents a009b07a 008f4df3

media/mtp/MtpFfsHandle.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -724,7 +724,7 @@ int MtpFfsHandle::sendEvent(mtp_event me) { 
    char *temp = new char[me.length];

    char *temp = new char[me.length];

    memcpy(temp, me.data, me.length);

    memcpy(temp, me.data, me.length);

    me.data = temp;

    me.data = temp;

    std::thread t([&me](MtpFfsHandle *h) { return h->doSendEvent(me); }, this);

    std::thread t([this, me]() { return this->doSendEvent(me); });

    t.detach();

    t.detach();

    return 0;

    return 0;

}

}
@@ -732,9 +732,9 @@ int MtpFfsHandle::sendEvent(mtp_event me) { 
void MtpFfsHandle::doSendEvent(mtp_event me) {

void MtpFfsHandle::doSendEvent(mtp_event me) {

    unsigned length = me.length;

    unsigned length = me.length;

    int ret = ::write(mIntr, me.data, length);

    int ret = ::write(mIntr, me.data, length);

    delete[] reinterpret_cast<char*>(me.data);

    if (static_cast<unsigned>(ret) != length)

    if (static_cast<unsigned>(ret) != length)

        PLOG(ERROR) << "Mtp error sending event thread!";

        PLOG(ERROR) << "Mtp error sending event thread!";

    delete[] reinterpret_cast<char*>(me.data);

}

}





} // namespace android

} // namespace android