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

Commit 97c8d904 authored by Mike Lockwood's avatar Mike Lockwood
Browse files

MTP: Fix reading and writing property descriptors 



We were missing support for the group code, resulting in an off by 4 bytes problem.

Change-Id: I4a640c67b8d36e1bd658b6185178a71966d4b0b6
Signed-off-by: default avatarMike Lockwood <lockwood@android.com>
parent d3793f38

media/mtp/MtpProperty.cpp

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ MtpProperty::MtpProperty() 
        mDefaultArrayValues(NULL),

        mCurrentArrayLength(0),

        mCurrentArrayValues(NULL),

        mGroupCode(0),

        mFormFlag(kFormNone),

        mEnumLength(0),

        mEnumValues(NULL)
@@ -52,6 +53,7 @@ MtpProperty::MtpProperty(MtpPropertyCode propCode, 
        mDefaultArrayValues(NULL),

        mCurrentArrayLength(0),

        mCurrentArrayValues(NULL),

        mGroupCode(0),

        mFormFlag(kFormNone),

        mEnumLength(0),

        mEnumValues(NULL)
@@ -142,6 +144,7 @@ void MtpProperty::read(MtpDataPacket& packet, bool deviceProp) { 
            if (deviceProp)

                readValue(packet, mCurrentValue);

    }

    mGroupCode = packet.getUInt32();

    mFormFlag = packet.getUInt8();



    if (mFormFlag == kFormRange) {
@@ -178,6 +181,7 @@ void MtpProperty::write(MtpDataPacket& packet) { 
        default:

            writeValue(packet, mDefaultValue);

    }

    packet.putUInt32(mGroupCode);

    packet.putUInt8(mFormFlag);

    if (mFormFlag == kFormRange) {

            writeValue(packet, mMinimumValue);

media/mtp/MtpProperty.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ public: 
        kFormRange = 1,

        kFormEnum = 2,

    };



    uint32_t            mGroupCode;

    uint8_t             mFormFlag;



    // for range form