summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakeshi Kishimoto <kishimoto@google.com>2010-06-18 10:33:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-18 10:33:13 -0700
commitf1792b3d125a6adefa6941d20b3f26833570ab65 (patch)
tree2cff9e3f4426132c31798a7c90d90c003145fa8e
parent50ca0c7720b66cfc322247b7f407b3cbe5823053 (diff)
parent2124afeee1f19423e71c52ede6f4926f5389e917 (diff)
downloadsystem_core-f1792b3d125a6adefa6941d20b3f26833570ab65.zip
system_core-f1792b3d125a6adefa6941d20b3f26833570ab65.tar.gz
system_core-f1792b3d125a6adefa6941d20b3f26833570ab65.tar.bz2
am 2124afee: Added NEC and PMC\'s USB VIDs upon their request.
Merge commit '2124afeee1f19423e71c52ede6f4926f5389e917' into gingerbread-plus-aosp * commit '2124afeee1f19423e71c52ede6f4926f5389e917': Added NEC and PMC's USB VIDs upon their request.
-rw-r--r--adb/usb_vendors.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 6d85fb1..9e1600f 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -69,6 +69,10 @@
#define VENDOR_ID_PANTECH 0x10A9
// Qualcomm's USB Vendor ID
#define VENDOR_ID_QUALCOMM 0x05c6
+// NEC's USB Vendor ID
+#define VENDOR_ID_NEC 0x0409
+// Panasonic Mobile Communication's USB Vendor ID
+#define VENDOR_ID_PMC 0x04DA
/** built-in vendor list */
@@ -90,6 +94,8 @@ int builtInVendorIds[] = {
VENDOR_ID_KYOCERA,
VENDOR_ID_PANTECH,
VENDOR_ID_QUALCOMM,
+ VENDOR_ID_NEC,
+ VENDOR_ID_PMC,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))