MTP: Support format argument in host GetObjectPropDesc command

Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8
Signed-off-by: Mike Lockwood <lockwood@android.com>

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);