summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphael Moll <ralf@android.com>2014-06-06 11:30:27 -0700
committerRaphael Moll <ralf@android.com>2014-06-06 12:50:21 -0700
commit700c6fd81dc6501df4cf7eb4ba399ecc021f67c8 (patch)
treef9dc74f739cba0d4b26b6b1794a701147ab4ee56
parent6ab8ef21b8826b19e92a47f70d3ba30e04ba66cc (diff)
downloadandroid_development-700c6fd81dc6501df4cf7eb4ba399ecc021f67c8.tar.gz
android_development-700c6fd81dc6501df4cf7eb4ba399ecc021f67c8.tar.bz2
android_development-700c6fd81dc6501df4cf7eb4ba399ecc021f67c8.zip
Android USB driver: support 4EE7 (Nexus adb only).
Bug: b/14988808 Change-Id: Ib855f063c949649c059da09483f782d09fbf3d2c
-rwxr-xr-xhost/windows/usb/android_winusb.inf4
-rwxr-xr-xsdk/usbdriver_source.properties2
2 files changed, 4 insertions, 2 deletions
diff --git a/host/windows/usb/android_winusb.inf b/host/windows/usb/android_winusb.inf
index 6c2d5258e..d12ba2710 100755
--- a/host/windows/usb/android_winusb.inf
+++ b/host/windows/usb/android_winusb.inf
@@ -6,7 +6,7 @@ Signature = "$Windows NT$"
Class = AndroidUsbDeviceClass
ClassGuid = {3F966BD9-FA04-4ec5-991C-D326973B5128}
Provider = %ProviderName%
-DriverVer = 01/27/2014,9.0.0000.00000
+DriverVer = 06/06/2014,10.0.0000.00000
CatalogFile.NTx86 = androidwinusb86.cat
CatalogFile.NTamd64 = androidwinusba64.cat
@@ -50,6 +50,7 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE7
;Google Glass
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_9001
@@ -84,6 +85,7 @@ HKR,,Icon,,-1
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE2&MI_01
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE4&MI_02
%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE6&MI_01
+%CompositeAdbInterface% = USB_Install, USB\VID_18D1&PID_4EE7
;Google Glass
%SingleAdbInterface% = USB_Install, USB\VID_18D1&PID_9001
diff --git a/sdk/usbdriver_source.properties b/sdk/usbdriver_source.properties
index 5a0875c5b..d68d7c26b 100755
--- a/sdk/usbdriver_source.properties
+++ b/sdk/usbdriver_source.properties
@@ -1,3 +1,3 @@
-Pkg.Revision=9
+Pkg.Revision=10
Archive.HostOs=WINDOWS
Extra.Path=usb_driver