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

Commit 678cc329 authored by Xavier Ducrohet's avatar Xavier Ducrohet Committed by Android Git Automerger
Browse files

am c7a67d0f: resolved conflicts for merge of 246808be to jb-dev-plus-aosp 

* commit 'c7a67d0f':
  Add USB Vendor ID for Yulong Coolpad.
parents 51a95864 c7a67d0f

adb/usb_vendors.c

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ 
#define VENDOR_ID_SONY          0x054C

// Lab126's USB Vendor ID

#define VENDOR_ID_LAB126        0x1949

// Yulong Coolpad's USB Vendor ID

#define VENDOR_ID_YULONG_COOLPAD 0x1EBF



/** built-in vendor list */

int builtInVendorIds[] = {
@@ -173,6 +175,7 @@ int builtInVendorIds[] = { 
    VENDOR_ID_INQ_MOBILE,

    VENDOR_ID_SONY,

    VENDOR_ID_LAB126,

    VENDOR_ID_YULONG_COOLPAD,

};



#define BUILT_IN_VENDOR_COUNT    (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))