summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet2009-11-02 13:45:56 -0600
committerAndroid Git Automerger2009-11-02 13:45:56 -0600
commit1b9f8c6ad85c773ffcafe8198e899e0405940862 (patch)
tree773a9c3a0711f79c890c0d2affd5f9bcf70f4c06
parent805d67ab11c1bb21d494459d6167f5f67f0002eb (diff)
parent23433b93d1acb01650c9480d9bb5d5d869ba4f79 (diff)
downloadplatform-system-core-1b9f8c6ad85c773ffcafe8198e899e0405940862.tar.gz
platform-system-core-1b9f8c6ad85c773ffcafe8198e899e0405940862.tar.xz
platform-system-core-1b9f8c6ad85c773ffcafe8198e899e0405940862.zip
am 23433b93: Add Sony-Ericsson to adb.
Merge commit '23433b93d1acb01650c9480d9bb5d5d869ba4f79' into eclair * commit '23433b93d1acb01650c9480d9bb5d5d869ba4f79': Add Sony-Ericsson to adb.
-rw-r--r--adb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 5534fd900..064abc008 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -49,6 +49,8 @@
49#define VENDOR_ID_HUAWEI 0x12D1 49#define VENDOR_ID_HUAWEI 0x12D1
50// Acer's USB Vendor ID 50// Acer's USB Vendor ID
51#define VENDOR_ID_ACER 0x0502 51#define VENDOR_ID_ACER 0x0502
52// Sony Ericsson's USB Vendor ID
53#define VENDOR_ID_SONY_ERICSSON 0x0FCE
52 54
53/** built-in vendor list */ 55/** built-in vendor list */
54int builtInVendorIds[] = { 56int builtInVendorIds[] = {
@@ -59,6 +61,7 @@ int builtInVendorIds[] = {
59 VENDOR_ID_LGE, 61 VENDOR_ID_LGE,
60 VENDOR_ID_HUAWEI, 62 VENDOR_ID_HUAWEI,
61 VENDOR_ID_ACER, 63 VENDOR_ID_ACER,
64 VENDOR_ID_SONY_ERICSSON,
62}; 65};
63 66
64#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) 67#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))