diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-12-07 18:56:58 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-12-07 18:56:58 -0800 |
| commit | e52fda6714a209fa2117d970919324b56573f90f (patch) | |
| tree | 3be01e786c2dd5b8345ae2133166c2a73f2d7a3e /media/mtp | |
| parent | faac5c1a0aac9b09c4edf3d3ca3ea266787fd0c5 (diff) | |
| parent | 99e393a39a31bfbdeb435462939519e2d0279433 (diff) | |
| download | frameworks_av-e52fda6714a209fa2117d970919324b56573f90f.zip frameworks_av-e52fda6714a209fa2117d970919324b56573f90f.tar.gz frameworks_av-e52fda6714a209fa2117d970919324b56573f90f.tar.bz2 | |
Merge "MTP: Support format argument in host GetObjectPropDesc command"
Diffstat (limited to 'media/mtp')
| -rw-r--r-- | media/mtp/MtpDevice.cpp | 5 | ||||
| -rw-r--r-- | media/mtp/MtpDevice.h | 2 |
2 files changed, 4 insertions, 3 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()) diff --git a/media/mtp/MtpDevice.h b/media/mtp/MtpDevice.h index c7ba7db..6ffbd24 100644 --- a/media/mtp/MtpDevice.h +++ b/media/mtp/MtpDevice.h @@ -89,7 +89,7 @@ public: MtpObjectPropertyList* getObjectPropsSupported(MtpObjectFormat format); MtpProperty* getDevicePropDesc(MtpDeviceProperty code); - MtpProperty* getObjectPropDesc(MtpObjectProperty code); + MtpProperty* getObjectPropDesc(MtpObjectProperty code, MtpObjectFormat format); bool readObject(MtpObjectHandle handle, const char* destPath, int group, int perm); |