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

Commit d35c2120 authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 1f7101ee: am 64c496c8: Merge "Fix MTP delete" into lmp-mr1-dev 

* commit '1f7101ee':
  Fix MTP delete
parents 882ffba6 1f7101ee

media/mtp/MtpServer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1119,10 +1119,10 @@ static void deletePath(const char* path) { 
MtpResponseCode MtpServer::doDeleteObject() {

    if (!hasStorage())

        return MTP_RESPONSE_INVALID_OBJECT_HANDLE;

    if (mRequest.getParameterCount() < 2)

    if (mRequest.getParameterCount() < 1)

        return MTP_RESPONSE_INVALID_PARAMETER;

    MtpObjectHandle handle = mRequest.getParameter(1);

    MtpObjectFormat format = mRequest.getParameter(2);

    MtpObjectFormat format;

    // FIXME - support deleting all objects if handle is 0xFFFFFFFF

    // FIXME - implement deleting objects by format