summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpDevice.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2010-12-07 18:53:04 -0800
committerMike Lockwood <lockwood@android.com>2010-12-07 18:53:04 -0800
commit99e393a39a31bfbdeb435462939519e2d0279433 (patch)
treeb4fbe06804f106403ca1dad9eaf421d434566ce6 /media/mtp/MtpDevice.cpp
parent5da864845e024833c4c7f641acd7c88187a6bc1e (diff)
downloadframeworks_av-99e393a39a31bfbdeb435462939519e2d0279433.zip
frameworks_av-99e393a39a31bfbdeb435462939519e2d0279433.tar.gz
frameworks_av-99e393a39a31bfbdeb435462939519e2d0279433.tar.bz2
MTP: Support format argument in host GetObjectPropDesc command
Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpDevice.cpp')
-rw-r--r--media/mtp/MtpDevice.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index 8d682ce..8ad39dc 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -110,7 +110,7 @@ void MtpDevice::print() {
if (props) {
for (int j = 0; j < props->size(); j++) {
MtpObjectProperty prop = (*props)[j];
- MtpProperty* property = getObjectPropDesc(prop);
+ MtpProperty* property = getObjectPropDesc(prop, format);
if (property)
property->print();
else
@@ -400,11 +400,12 @@ MtpProperty* MtpDevice::getDevicePropDesc(MtpDeviceProperty code) {
return NULL;
}
-MtpProperty* MtpDevice::getObjectPropDesc(MtpObjectProperty code) {
+MtpProperty* MtpDevice::getObjectPropDesc(MtpObjectProperty code, MtpObjectFormat format) {
Mutex::Autolock autoLock(mMutex);
mRequest.reset();
mRequest.setParameter(1, code);
+ mRequest.setParameter(2, format);
if (!sendRequest(MTP_OPERATION_GET_OBJECT_PROP_DESC))
return NULL;
if (!readData())