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

Commit 70580b20 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 149ae11f: Merge "adb,fastboot: add USB support for Intel Vendor ID" 

* commit '149ae11f':
  adb,fastboot: add USB support for Intel Vendor ID
parents 546dc10c 149ae11f

adb/usb_vendors.c

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 


// Google's USB Vendor ID

#define VENDOR_ID_GOOGLE        0x18d1

// Intel's USB Vendor ID

#define VENDOR_ID_INTEL         0x8087

// HTC's USB Vendor ID

#define VENDOR_ID_HTC           0x0bb4

// Samsung's USB Vendor ID
@@ -121,6 +123,7 @@ 
/** built-in vendor list */

int builtInVendorIds[] = {

    VENDOR_ID_GOOGLE,

    VENDOR_ID_INTEL,

    VENDOR_ID_HTC,

    VENDOR_ID_SAMSUNG,

    VENDOR_ID_MOTOROLA,

fastboot/fastboot.c

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ int match_fastboot(usb_ifc_info *info) 
{

    if(!(vendor_id && (info->dev_vendor == vendor_id)) &&

       (info->dev_vendor != 0x18d1) &&  // Google

       (info->dev_vendor != 0x8087) &&  // Intel

       (info->dev_vendor != 0x0451) &&

       (info->dev_vendor != 0x0502) &&

       (info->dev_vendor != 0x0fce) &&  // Sony Ericsson