summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-27 21:32:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-27 21:32:01 +0000
commit8ed26bd6531a8d52dcaff6c14b6fc59749791679 (patch)
treee132372eed8e7e96bf791ca00f6771a8d0b0fc5d
parent972677557bd2c3a0678a945765783e85c7ec7b9c (diff)
parent769db021e6b61d10c13a7b17a72750f18ebdee16 (diff)
downloadsystem_core-8ed26bd6531a8d52dcaff6c14b6fc59749791679.zip
system_core-8ed26bd6531a8d52dcaff6c14b6fc59749791679.tar.gz
system_core-8ed26bd6531a8d52dcaff6c14b6fc59749791679.tar.bz2
am 769db021: am b24085d5: Merge "adb: Add USB vendor ID for Unowhy"
* commit '769db021e6b61d10c13a7b17a72750f18ebdee16': adb: Add USB vendor ID for Unowhy
-rwxr-xr-xadb/usb_vendors.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/adb/usb_vendors.c b/adb/usb_vendors.c
index 0357ced..c7e0ad5 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -172,6 +172,8 @@
#define VENDOR_ID_TI 0x0451
// Toshiba's USB Vendor ID
#define VENDOR_ID_TOSHIBA 0x0930
+// Unowhy's USB Vendor ID
+#define VENDOR_ID_UNOWHY 0x2A49
// Vizio's USB Vendor ID
#define VENDOR_ID_VIZIO 0xE040
// Wacom's USB Vendor ID
@@ -257,6 +259,7 @@ int builtInVendorIds[] = {
VENDOR_ID_TELEEPOCH,
VENDOR_ID_TI,
VENDOR_ID_TOSHIBA,
+ VENDOR_ID_UNOWHY,
VENDOR_ID_VIZIO,
VENDOR_ID_WACOM,
VENDOR_ID_XIAOMI,