From 99e393a39a31bfbdeb435462939519e2d0279433 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Tue, 7 Dec 2010 18:53:04 -0800
Subject: MTP: Support format argument in host GetObjectPropDesc command

Change-Id: Ic14313c0f95bea1d1d475cc6a001b256fccb91c8
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 media/mtp/MtpDevice.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'media/mtp/MtpDevice.cpp')

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())
-- 
cgit v1.1