commit 0148e603d827464e344eb1c442919f70e8c6f051
author The Android Automerger <android-build@android.com> Tue Jan 24 13:33:52 2012 -0800
committer The Android Automerger <android-build@android.com> Tue Jan 24 13:33:52 2012 -0800
tree f80e778f7be71aa2cd26c4095b60ecd14431c609
parent 746f3243f6d30ab51a36dcfea76eac3ba29ac625
parent 2eb08e44350e2f49716f9476110497795ff67ff2

merge in ics-mr1-release history after reset to ics-mr1

adb/usb_vendors.c

diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index a8b0ca2..d213dd9 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -117,6 +117,12 @@
 #define VENDOR_ID_LUMIGON       0x25E3
 //Intel's USB Vendor ID
 #define VENDOR_ID_INTEL         0x8087
+// Quanta's USB Vendor ID
+#define VENDOR_ID_QUANTA        0x0408
+// INQ Mobile's USB Vendor ID
+#define VENDOR_ID_INQ_MOBILE    0x2314
+// Sony's USB Vendor ID
+#define VENDOR_ID_SONY          0x054C
 
 /** built-in vendor list */
 int builtInVendorIds[] = {
@@ -161,6 +167,9 @@
     VENDOR_ID_FUJITSU,
     VENDOR_ID_LUMIGON,
     VENDOR_ID_INTEL,
+    VENDOR_ID_QUANTA,
+    VENDOR_ID_INQ_MOBILE,
+    VENDOR_ID_SONY,
 };
 
 #define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 4a2de20..a069d33 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -157,6 +157,7 @@
        (info->dev_vendor != 0x22b8) &&  // Motorola
        (info->dev_vendor != 0x0955) &&  // Nvidia
        (info->dev_vendor != 0x413c) &&  // DELL
+       (info->dev_vendor != 0x2314) &&  // INQ Mobile
        (info->dev_vendor != 0x0bb4))    // HTC
             return -1;
     if(info->ifc_class != 0xff) return -1;