diff --git a/media/mtp/ptptest.cpp b/media/mtp/ptptest.cpp
index 3922b61..2efa4c9 100644
--- a/media/mtp/ptptest.cpp
+++ b/media/mtp/ptptest.cpp
@@ -22,6 +22,8 @@
 #include <linux/usb/ch9.h>
 
 #include "MtpClient.h"
+#include "MtpDeviceInfo.h"
+#include "MtpStorageInfo.h"
 
 using namespace android;
 
@@ -37,7 +39,21 @@
         delete sClient;
     sClient = new MtpClient(ep_in, ep_out, ep_intr);
     sClient->openSession();
-    sClient->getDeviceInfo();
+    MtpDeviceInfo* info = sClient->getDeviceInfo();
+    if (info) {
+        info->print();
+        delete info;
+    }
+    MtpStorageIDList* storageIDs = sClient->getStorageIDs();
+    if (storageIDs) {
+        for (int i = 0; i < storageIDs->size(); i++) {
+            MtpStorageInfo* info = sClient->getStorageInfo((*storageIDs)[i]);
+            if (info) {
+                info->print();
+                delete info;
+            }
+        }
+    }
 }
 
 static void usb_device_added(const char *devname)