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

Commit 72028075 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain... 

am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1

* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
parents a33b7d94 fed8bb60

media/mtp/MtpServer.cpp

+7 −4
Original line number Diff line number Diff line
@@ -1053,13 +1053,16 @@ MtpResponseCode MtpServer::doDeleteObject() { 
    int result = mDatabase->getObjectFilePath(handle, filePath, fileLength, format);

    if (result == MTP_RESPONSE_OK) {

        LOGV("deleting %s", (const char *)filePath);

        result = mDatabase->deleteFile(handle);

        // Don't delete the actual files unless the database deletion is allowed

        if (result == MTP_RESPONSE_OK) {

            deletePath((const char *)filePath);

        return mDatabase->deleteFile(handle);

    } else {

        return result;

        }

    }



    return result;

}



MtpResponseCode MtpServer::doGetObjectPropDesc() {

    MtpObjectProperty propCode = mRequest.getParameter(1);

    MtpObjectFormat format = mRequest.getParameter(2);