diff options
| author | Benoit Goby <benoit@android.com> | 2013-03-29 16:29:22 -0700 |
|---|---|---|
| committer | Benoit Goby <benoit@android.com> | 2013-03-29 16:29:22 -0700 |
| commit | 78420edc0f3e99684c36f0d516744b4d9312a1c1 (patch) | |
| tree | a9edd378ec3c49ed73605b56cab60d18cbb136da /adb | |
| parent | 9c37960cd9169c160d9865a6d63e256e125b4aae (diff) | |
| parent | 352004220a4ae6161d031a20380d862fe482b70d (diff) | |
| download | system_core-78420edc0f3e99684c36f0d516744b4d9312a1c1.zip system_core-78420edc0f3e99684c36f0d516744b4d9312a1c1.tar.gz system_core-78420edc0f3e99684c36f0d516744b4d9312a1c1.tar.bz2 | |
resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp
Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
Diffstat (limited to 'adb')
| -rwxr-xr-x[-rw-r--r--] | adb/usb_vendors.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c index df9b1d1..604c461 100644..100755 --- a/adb/usb_vendors.c +++ b/adb/usb_vendors.c @@ -137,6 +137,10 @@ #define VENDOR_ID_HARRIS 0x19A5 // OPPO's USB Vendor ID #define VENDOR_ID_OPPO 0x22D9 +// Xiaomi's USB Vendor ID +#define VENDOR_ID_XIAOMI 0x2717 +// BYD's USB Vendor ID +#define VENDOR_ID_BYD 0x19D1 /** built-in vendor list */ @@ -192,6 +196,8 @@ int builtInVendorIds[] = { VENDOR_ID_ANYDATA, VENDOR_ID_HARRIS, VENDOR_ID_OPPO, + VENDOR_ID_XIAOMI, + VENDOR_ID_BYD, }; #define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0])) |