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

Commit 7ebcd43f authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge changes Ia95ff014,Ib31708c3 

* changes:
  MTP: Add debug code for printing names of MTP format and property codes.
  MTP: Fix some typos
parents 02890fd0 d3793f38

media/jni/android_media_MtpDatabase.cpp

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ struct PropertyTableEntry { 
static const PropertyTableEntry   kPropertyTable[] = {

    {   MTP_PROPERTY_PARENT_OBJECT,     MTP_TYPE_UINT32 },

    {   MTP_PROPERTY_STORAGE_ID,        MTP_TYPE_UINT32 },

    {   MTP_PROPERTY_OBJECT_FORMAT,     MTP_TYPE_UINT32 },

    {   MTP_PROPERTY_OBJECT_FORMAT,     MTP_TYPE_UINT16 },

    {   MTP_PROPERTY_OBJECT_FILE_NAME,  MTP_TYPE_STR    },

    {   MTP_PROPERTY_OBJECT_SIZE,       MTP_TYPE_UINT64 },

    {   MTP_PROPERTY_DATE_MODIFIED,     MTP_TYPE_STR    },

media/mtp/MtpDebug.cpp

+317 −6

File changed.

Preview size limit exceeded, changes collapsed.

media/mtp/MtpDebug.h

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef _MTP_DEBUG_H

#define _MTP_DEBUG_H



// #define LOG_NDEBUG 0

#define LOG_NDEBUG 0

#include <utils/Log.h>



#include "MtpTypes.h"
@@ -27,6 +27,9 @@ namespace android { 
class MtpDebug {

public:

    static const char* getOperationCodeName(MtpOperationCode code);

    static const char* getFormatCodeName(MtpObjectFormat code);

    static const char* getObjectPropCodeName(MtpPropertyCode code);

    static const char* getDevicePropCodeName(MtpPropertyCode code);

};



}; // namespace android

media/mtp/MtpServer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ void MtpServer::sendObjectRemoved(MtpObjectHandle handle) { 
}



void MtpServer::initObjectProperties() {

    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT16));

    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_STORAGE_ID, MTP_TYPE_UINT32));

    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FORMAT, MTP_TYPE_UINT16));

    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_SIZE, MTP_TYPE_UINT64));

    mObjectProperties.push(new MtpProperty(MTP_PROPERTY_OBJECT_FILE_NAME, MTP_TYPE_STR));

media/mtp/mtp.h

+2 −2
Original line number Diff line number Diff line
@@ -465,8 +465,8 @@ 


// Storage Access Capability

#define MTP_STORAGE_READ_WRITE                      0x0000

#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE        0x0000

#define MTP_STORAGE_READ_ONLY_WITH_DELETE           0x0000

#define MTP_STORAGE_READ_ONLY_WITHOUT_DELETE        0x0001

#define MTP_STORAGE_READ_ONLY_WITH_DELETE           0x0002



// Association Type

#define MTP_ASSOCIATION_TYPE_UNDEFINED              0x0000