Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MTP: Fix reading and writing device property descriptors

Browse Source 
Change-Id: I8d9653ceedfed688addd6c4194c097d7090c3468
Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2010-09-25 08:37:59 -04:00
parent 409a90cd78
commit 564ff84321
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
media/mtp/MtpProperty.cpp
View File

@@ -121,6 +121,7 @@ MtpProperty::~MtpProperty() {
}
void MtpProperty::read(MtpDataPacket& packet) {
bool deviceProp = isDeviceProperty();
mCode = packet.getUInt16();
mType = packet.getUInt16();
@@ -137,14 +138,16 @@ void MtpProperty::read(MtpDataPacket& packet) {
case MTP_TYPE_AINT128:
case MTP_TYPE_AUINT128:
mDefaultArrayValues = readArrayValues(packet, mDefaultArrayLength);
mCurrentArrayValues = readArrayValues(packet, mCurrentArrayLength);
if (deviceProp)
mCurrentArrayValues = readArrayValues(packet, mCurrentArrayLength);
break;
default:
readValue(packet, mDefaultValue);
if (isDeviceProperty())
if (deviceProp)
readValue(packet, mCurrentValue);
}
mGroupCode = packet.getUInt32();
if (!deviceProp)
mGroupCode = packet.getUInt32();
mFormFlag = packet.getUInt8();
if (mFormFlag == kFormRange) {
@@ -160,6 +163,8 @@ void MtpProperty::read(MtpDataPacket& packet) {
}
void MtpProperty::write(MtpDataPacket& packet) {
bool deviceProp = isDeviceProperty();
packet.putUInt16(mCode);
packet.putUInt16(mType);
packet.putUInt8(mWriteable ? 1 : 0);
@@ -176,12 +181,17 @@ void MtpProperty::write(MtpDataPacket& packet) {
case MTP_TYPE_AINT128:
case MTP_TYPE_AUINT128:
writeArrayValues(packet, mDefaultArrayValues, mDefaultArrayLength);
if (deviceProp)
writeArrayValues(packet, mCurrentArrayValues, mCurrentArrayLength);
break;
default:
writeValue(packet, mDefaultValue);
if (deviceProp)
writeValue(packet, mCurrentValue);
}
packet.putUInt32(mGroupCode);
packet.putUInt8(mFormFlag);
if (!deviceProp)
packet.putUInt8(mFormFlag);
if (mFormFlag == kFormRange) {
writeValue(packet, mMinimumValue);
writeValue(packet, mMaximumValue);