summaryrefslogtreecommitdiffstats
path: root/media/mtp/MtpDevice.cpp
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-15 14:55:51 -0500
committerMike Lockwood <lockwood@android.com>2011-02-15 14:55:51 -0500
commitd4fb52e3031578119ecd53087b1bcb4828c333c5 (patch)
treed4019afe98cb780b9beaf619c15bc581bc62efc5 /media/mtp/MtpDevice.cpp
parentf1958f9442bc937e1f8c8d9175901500b944b021 (diff)
downloadframeworks_av-d4fb52e3031578119ecd53087b1bcb4828c333c5.zip
frameworks_av-d4fb52e3031578119ecd53087b1bcb4828c333c5.tar.gz
frameworks_av-d4fb52e3031578119ecd53087b1bcb4828c333c5.tar.bz2
MTP host: disable some test code
Change-Id: I2237ad88f73b03a2c324f17267c52cc42b8a0d5b Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'media/mtp/MtpDevice.cpp')
-rw-r--r--media/mtp/MtpDevice.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/media/mtp/MtpDevice.cpp b/media/mtp/MtpDevice.cpp
index fb1b073..4ea8849 100644
--- a/media/mtp/MtpDevice.cpp
+++ b/media/mtp/MtpDevice.cpp
@@ -38,6 +38,7 @@
namespace android {
+#if 0
static bool isMtpDevice(uint16_t vendor, uint16_t product) {
// Sandisk Sansa Fuze
if (vendor == 0x0781 && product == 0x74c2)
@@ -47,6 +48,7 @@ static bool isMtpDevice(uint16_t vendor, uint16_t product) {
return true;
return false;
}
+#endif
MtpDevice* MtpDevice::open(const char* deviceName, int fd) {
struct usb_device *device = usb_device_new(deviceName, fd);
@@ -91,7 +93,9 @@ MtpDevice* MtpDevice::open(const char* deviceName, int fd) {
LOGD("Found MTP device: \"%s\" \"%s\"\n", manufacturerName, productName);
free(manufacturerName);
free(productName);
- } else {
+ }
+#if 0
+ else {
// look for special cased devices based on vendor/product ID
// we are doing this mainly for testing purposes
uint16_t vendor = usb_device_get_vendor_id(device);
@@ -119,7 +123,7 @@ MtpDevice* MtpDevice::open(const char* deviceName, int fd) {
printf("no MTP string\n");
}
}
-
+#endif
// if we got here, then we have a likely MTP or PTP device
// interface should be followed by three endpoints