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

Commit 8dd02f16 authored by nolyn.lu's avatar nolyn.lu Committed by android-build-merger
Browse files

Merge "can't copy/paste folders on sdcard from PC side in MTP mode" am:... 

Merge "can't copy/paste folders on sdcard from PC side in MTP mode" am: 130e1d19 am: ab26cfa4 am: 3bd0212e
am: abe5ec4c

Change-Id: I5bfb8399774e1e87fc03fe603408be69ddc66979
parents 9c82c6e7 abe5ec4c

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 {

static const int SN_EVENT_LOG_ID = 0x534e4554;
@@ -956,6 +957,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;