resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp
Change-Id: I754b8b17a7e3a6e4ef3ccf0a02beca0fc72ba749
This commit is contained in:
commit
78420edc0f
1 changed files with 6 additions and 0 deletions
6
adb/usb_vendors.c
Normal file → Executable file
6
adb/usb_vendors.c
Normal file → Executable file
|
|
@ -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]))
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue