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

Commit 5b19af05 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Use DateTime form in GetObjectPropDesc for date/time properties. 



Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent 5a2755d0

media/jni/android_media_MtpDatabase.cpp

+6 −3
Original line number Diff line number Diff line
@@ -948,18 +948,21 @@ MtpProperty* MyMtpDatabase::getObjectPropertyDesc(MtpObjectProperty property, 
            result = new MtpProperty(property, MTP_TYPE_UINT128);

            break;

        case MTP_PROPERTY_NAME:

        case MTP_PROPERTY_DATE_MODIFIED:

        case MTP_PROPERTY_DISPLAY_NAME:

        case MTP_PROPERTY_DATE_ADDED:

        case MTP_PROPERTY_ARTIST:

        case MTP_PROPERTY_ALBUM_NAME:

        case MTP_PROPERTY_ALBUM_ARTIST:

        case MTP_PROPERTY_ORIGINAL_RELEASE_DATE:

        case MTP_PROPERTY_GENRE:

        case MTP_PROPERTY_COMPOSER:

        case MTP_PROPERTY_DESCRIPTION:

            result = new MtpProperty(property, MTP_TYPE_STR);

            break;

        case MTP_PROPERTY_DATE_MODIFIED:

        case MTP_PROPERTY_DATE_ADDED:

        case MTP_PROPERTY_ORIGINAL_RELEASE_DATE:

            result = new MtpProperty(property, MTP_TYPE_STR);

            result->setFormDateTime();

            break;

        case MTP_PROPERTY_OBJECT_FILE_NAME:

            // We allow renaming files and folders

            result = new MtpProperty(property, MTP_TYPE_STR, true);

media/mtp/MtpProperty.cpp

+4 −0
Original line number Diff line number Diff line
@@ -312,6 +312,10 @@ void MtpProperty::setFormEnum(const int* values, int count) { 
    }

}



void MtpProperty::setFormDateTime() {

     mFormFlag = kFormDateTime;

}



void MtpProperty::print() {

    LOGV("MtpProperty %04X\n", mCode);

    LOGV("    type %04X\n", mType);

media/mtp/MtpProperty.h

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public: 
        kFormNone = 0,

        kFormRange = 1,

        kFormEnum = 2,

        kFormDateTime = 3,

    };



    uint32_t            mGroupCode;
@@ -90,6 +91,7 @@ public: 


    void                setFormRange(int min, int max, int step);

    void                setFormEnum(const int* values, int count);

    void                setFormDateTime();



    void                print();