commit 2bb8c0e7c4e4093f4161ff5e98cef51c87193859
author Mike Lockwood <lockwood@android.com> Mon Aug 09 14:49:28 2010 -0400
committer Mike Lockwood <lockwood@android.com> Mon Aug 09 14:49:28 2010 -0400
tree 0109f904c489ee6404d00b3e721b7772539a9d93
parent a1825afa98dcb8fe2e44750072eaa04f7638623f

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: Mike Lockwood <lockwood@android.com>

media/mtp/MtpProperty.cpp

diff --git a/media/mtp/MtpProperty.cpp b/media/mtp/MtpProperty.cpp
index d6beb8a..932ad6a 100644
--- a/media/mtp/MtpProperty.cpp
+++ b/media/mtp/MtpProperty.cpp
@@ -31,6 +31,7 @@
         mDefaultArrayValues(NULL),
         mCurrentArrayLength(0),
         mCurrentArrayValues(NULL),
+        mGroupCode(0),
         mFormFlag(kFormNone),
         mEnumLength(0),
         mEnumValues(NULL)
@@ -52,6 +53,7 @@
         mDefaultArrayValues(NULL),
         mCurrentArrayLength(0),
         mCurrentArrayValues(NULL),
+        mGroupCode(0),
         mFormFlag(kFormNone),
         mEnumLength(0),
         mEnumValues(NULL)
@@ -142,6 +144,7 @@
             if (deviceProp)
                 readValue(packet, mCurrentValue);
     }
+    mGroupCode = packet.getUInt32();
     mFormFlag = packet.getUInt8();
 
     if (mFormFlag == kFormRange) {
@@ -178,6 +181,7 @@
         default:
             writeValue(packet, mDefaultValue);
     }
+    packet.putUInt32(mGroupCode);
     packet.putUInt8(mFormFlag);
     if (mFormFlag == kFormRange) {
             writeValue(packet, mMinimumValue);

media/mtp/MtpProperty.h

diff --git a/media/mtp/MtpProperty.h b/media/mtp/MtpProperty.h
index 4923d40..c5b4e28 100644
--- a/media/mtp/MtpProperty.h
+++ b/media/mtp/MtpProperty.h
@@ -42,6 +42,8 @@
         kFormRange = 1,
         kFormEnum = 2,
     };
+
+    uint32_t            mGroupCode;
     uint8_t             mFormFlag;
 
     // for range form