summaryrefslogtreecommitdiffstats
path: root/adb
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-06-24 19:35:21 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-24 19:35:21 +0000
commitf6d86d75461ae3a246522932759e045dcc7a4952 (patch)
tree3d95c5c0afd8f1baaa1cb5eed4988a484a4fd097 /adb
parent079c637f3d269242bbc772b9207179b8cf56738a (diff)
parentd08b80ccc6f7d106a8bfc410f89e466b798e2ebe (diff)
downloadsystem_core-f6d86d75461ae3a246522932759e045dcc7a4952.tar.gz
system_core-f6d86d75461ae3a246522932759e045dcc7a4952.tar.bz2
system_core-f6d86d75461ae3a246522932759e045dcc7a4952.zip
am d08b80cc: am 20bda70f: Merge "Add Smartisan usb config"
* commit 'd08b80ccc6f7d106a8bfc410f89e466b798e2ebe': Add Smartisan usb config
Diffstat (limited to 'adb')
-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 e7d82686b..957e5db1c 100755
--- a/adb/usb_vendors.c
+++ b/adb/usb_vendors.c
@@ -162,6 +162,8 @@
#define VENDOR_ID_SHARP 0x04dd
// SK Telesys's USB Vendor ID
#define VENDOR_ID_SK_TELESYS 0x1F53
+// Smartisan's USB Vendor ID
+#define VENDOR_ID_SMARTISAN 0x29a9
// Sony's USB Vendor ID
#define VENDOR_ID_SONY 0x054C
// Sony Ericsson's USB Vendor ID
@@ -258,6 +260,7 @@ int builtInVendorIds[] = {
VENDOR_ID_SAMSUNG,
VENDOR_ID_SHARP,
VENDOR_ID_SK_TELESYS,
+ VENDOR_ID_SMARTISAN,
VENDOR_ID_SONY,
VENDOR_ID_SONY_ERICSSON,
VENDOR_ID_T_AND_A,