Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 243667a9 authored by Benoit Goby's avatar Benoit Goby Committed by Android Git Automerger
Browse files

am 78420edc: resolved conflicts for merge of 35200422 to jb-mr2-dev-plus-aosp 

* commit '78420edc':
  Add BYD's USB Vendor ID
  Add USB Vendor ID for Xiaomi
  Add vendor IDs to adb
parents 6c11676e 78420edc

adb/usb_vendors.c

100644 → 100755
+6 −0
Original line number Diff line number Diff line
@@ -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]))