summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpObjectInfo.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-06-08 07:33:14 -0400
committerMike Lockwood <lockwood@android.com>2010-06-10 14:08:29 -0400
commit0ef2bf5df731114fce7307dc881b69d198b6d933 (patch)
tree06c8f5fd409777f85965dbcd89bbf2f3a905eb15 /media/mtp/MtpObjectInfo.cpp
parent9f58d24b9ab509733368bdf7f0a446855706092e (diff)
downloadframeworks_av-0ef2bf5df731114fce7307dc881b69d198b6d933.zip
frameworks_av-0ef2bf5df731114fce7307dc881b69d198b6d933.tar.gz
frameworks_av-0ef2bf5df731114fce7307dc881b69d198b6d933.tar.bz2
MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table
Signed-off-by: Mike Lockwood <lockwood@android.com> Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
Diffstat (limited to 'media/mtp/MtpObjectInfo.cpp')
-rw-r--r--media/mtp/MtpObjectInfo.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/media/mtp/MtpObjectInfo.cpp b/media/mtp/MtpObjectInfo.cpp
index a0ee2b6..de0f54a 100644
--- a/media/mtp/MtpObjectInfo.cpp
+++ b/media/mtp/MtpObjectInfo.cpp
@@ -64,7 +64,7 @@ void MtpObjectInfo::read(MtpDataPacket& packet) {
mProtectionStatus = packet.getUInt16();
mCompressedSize = packet.getUInt32();
mThumbFormat = packet.getUInt16();
- mCompressedSize = packet.getUInt32();
+ mThumbCompressedSize = packet.getUInt32();
mThumbPixWidth = packet.getUInt32();
mThumbPixHeight = packet.getUInt32();
mImagePixWidth = packet.getUInt32();
@@ -92,6 +92,17 @@ void MtpObjectInfo::read(MtpDataPacket& packet) {
void MtpObjectInfo::print() {
LOGD("MtpObject Info %08X: %s\n", mHandle, mName);
+ LOGD(" mStorageID: %08X mFormat: %04X mProtectionStatus: %d\n",
+ mStorageID, mFormat, mProtectionStatus);
+ LOGD(" mCompressedSize: %d mThumbFormat: %04X mThumbCompressedSize: %d\n",
+ mCompressedSize, mFormat, mThumbCompressedSize);
+ LOGD(" mThumbPixWidth: %d mThumbPixHeight: %d\n", mThumbPixWidth, mThumbPixHeight);
+ LOGD(" mImagePixWidth: %d mImagePixHeight: %d mImagePixDepth: %d\n",
+ mImagePixWidth, mImagePixHeight, mImagePixDepth);
+ LOGD(" mParent: %08X mAssociationType: %04X mAssociationDesc: %04X\n",
+ mParent, mAssociationType, mAssociationDesc);
+ LOGD(" mSequenceNumber: %d mDateCreated: %d mDateModified: %d mKeywords: %s\n",
+ mSequenceNumber, mDateCreated, mDateModified, mKeywords);
}
} // namespace android