summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Lin <samlin@google.com>2013-03-13 03:01:43 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-13 03:01:45 +0000
commit91535cff09af5b0181bffe64e97dcae9d24ba219 (patch)
tree4c7ebaae79fab35c06cfaaddea8ddec0594e9b13
parentd4b360a2e89d7d7f2dd7ff5f7dca6a2578c532cf (diff)
parent644b6afdacec5ae0724ca799b643a808b6d290c7 (diff)
downloadsystem_core-91535cff09af5b0181bffe64e97dcae9d24ba219.zip
system_core-91535cff09af5b0181bffe64e97dcae9d24ba219.tar.gz
system_core-91535cff09af5b0181bffe64e97dcae9d24ba219.tar.bz2
Merge "Add vendor IDs to adb" into jb-mr2-dev
-rw-r--r--adb/usb_vendors.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 3a8e8fd..df9b1d1 100644
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -131,6 +131,12 @@
#define VENDOR_ID_KOBO 0x2237
// Teleepoch's USB Vendor ID
#define VENDOR_ID_TELEEPOCH 0x2340
+// AnyDATA's USB Vendor ID
+#define VENDOR_ID_ANYDATA 0x16D5
+// Harris's USB Vendor ID
+#define VENDOR_ID_HARRIS 0x19A5
+// OPPO's USB Vendor ID
+#define VENDOR_ID_OPPO 0x22D9
/** built-in vendor list */
@@ -183,6 +189,9 @@ int builtInVendorIds[] = {
VENDOR_ID_YULONG_COOLPAD,
VENDOR_ID_KOBO,
VENDOR_ID_TELEEPOCH,
+ VENDOR_ID_ANYDATA,
+ VENDOR_ID_HARRIS,
+ VENDOR_ID_OPPO,
};
#define BUILT_IN_VENDOR_COUNT (sizeof(builtInVendorIds)/sizeof(builtInVendorIds[0]))