aboutsummaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2009-11-02 12:04:56 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-02 12:04:56 -0800
commit3b01d5481931eae541afd9e429b6456b9487269d (patch)
treec0a6e367d04981647acaa8e2615414cc7dd88b1b /adb
parent1c2ce696c8758e4e96a45576768a17e4f8335595 (diff)
parent96f0d140df11c2efeecd8b0eed9ffad514456034 (diff)
downloadsystem_core-3b01d5481931eae541afd9e429b6456b9487269d.zip
system_core-3b01d5481931eae541afd9e429b6456b9487269d.tar.gz
system_core-3b01d5481931eae541afd9e429b6456b9487269d.tar.bz2
am 96f0d140: am df872bec: am 1b9f8c6a: am 23433b93: Add Sony-Ericsson to adb.
Merge commit '96f0d140df11c2efeecd8b0eed9ffad514456034' * commit '96f0d140df11c2efeecd8b0eed9ffad514456034': Add Sony-Ericsson to adb.
Diffstat (limited 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 5534fd9..064abc0 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -49,6 +49,8 @@
#define VENDOR_ID_HUAWEI 0x12D1
// Acer's USB Vendor ID
#define VENDOR_ID_ACER 0x0502
+// Sony Ericsson's USB Vendor ID
+#define VENDOR_ID_SONY_ERICSSON 0x0FCE
/** built-in vendor list */
int builtInVendorIds[] = {
@@ -59,6 +61,7 @@ int builtInVendorIds[] = {
VENDOR_ID_LGE,
VENDOR_ID_HUAWEI,
VENDOR_ID_ACER,
+ VENDOR_ID_SONY_ERICSSON,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))