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

Commit ef9bef54 authored by nolyn.lu's avatar nolyn.lu Committed by nolyn lu
Browse files

can't copy/paste folders on sdcard from PC side in MTP mode 

When copy/paste folders from PC (e.g. windows),
there's an extra white space at the end of the folder names.
It cause the mkdir call failed with *Invalid argument* on device.

bug: 139645636

Change-Id: I4f0c017fd086b87180ba014722cdcf4d988e8bc5
parent 6dc75fb0

media/mtp/MtpServer.cpp

+6 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include "MtpServer.h"

#include "MtpStorage.h"

#include "MtpStringBuffer.h"

#include "android-base/strings.h"



namespace android {
@@ -955,6 +956,11 @@ MtpResponseCode MtpServer::doSendObjectInfo() { 
    if (!mData.getString(modified)) return MTP_RESPONSE_INVALID_PARAMETER;     // date modified

    // keywords follow



    int type = storage->getType();

    if (type == MTP_STORAGE_REMOVABLE_RAM) {

        std::string str = android::base::Trim((const char*)name);

        name.set(str.c_str());

    }

    ALOGV("name: %s format: 0x%04X (%s)\n", (const char*)name, format,

          MtpDebug::getFormatCodeName(format));

    time_t modifiedTime;