commit 043b601774c0f302b73ed713772cd1bd62f43fe4
author Mike Lockwood <lockwood@android.com> Tue Dec 07 17:10:43 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 07 17:10:43 2010 -0800
tree df9773c3cf0b9b5b404bc6d213ff2d9498ad7f47
parent baf00537ab2a022c11a8e3bdc5518e39846d0d20
parent 2e09e289b7e136481e9215bb61ed47cee5d9919b

Merge "MTP: Use correct return type for getSupportedObjectProperties"

media/mtp/MtpServer.cpp

diff --git a/media/mtp/MtpServer.cpp b/media/mtp/MtpServer.cpp
index de6cbac..5c1e02a 100644
--- a/media/mtp/MtpServer.cpp
+++ b/media/mtp/MtpServer.cpp
@@ -423,7 +423,7 @@
     if (!mSessionOpen)
         return MTP_RESPONSE_SESSION_NOT_OPEN;
     MtpObjectFormat format = mRequest.getParameter(1);
-    MtpDevicePropertyList* properties = mDatabase->getSupportedObjectProperties(format);
+    MtpObjectPropertyList* properties = mDatabase->getSupportedObjectProperties(format);
     mData.putAUInt16(properties);
     delete properties;
     return MTP_RESPONSE_OK;