summaryrefslogtreecommitdiffstats
path: root/services/usb/java
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2015-04-29 13:05:55 -0700
committerMike Lockwood <lockwood@google.com>2015-04-29 13:05:55 -0700
commitc9bb40ea95101f8a46fab29beac02cc7204be320 (patch)
tree5aef354e455b83e8535eea75bbb8889f3d685bb5 /services/usb/java
parent2333912c6e4d51995a3fd01286c21c4d0328eb1a (diff)
downloadframeworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.zip
frameworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.tar.gz
frameworks_base-c9bb40ea95101f8a46fab29beac02cc7204be320.tar.bz2
UsbDevice: Add support for retrieving version string for a USB device
Change-Id: Ia8630f5ffd05f90347b971110a81f4927060cc4b
Diffstat (limited to 'services/usb/java')
-rw-r--r--services/usb/java/com/android/server/usb/UsbHostManager.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbHostManager.java b/services/usb/java/com/android/server/usb/UsbHostManager.java
index 5b58051..f5f2b07 100644
--- a/services/usb/java/com/android/server/usb/UsbHostManager.java
+++ b/services/usb/java/com/android/server/usb/UsbHostManager.java
@@ -112,7 +112,7 @@ public class UsbHostManager {
*/
private boolean beginUsbDeviceAdded(String deviceName, int vendorID, int productID,
int deviceClass, int deviceSubclass, int deviceProtocol,
- String manufacturerName, String productName, String serialNumber) {
+ String manufacturerName, String productName, int version, String serialNumber) {
if (DEBUG) {
Slog.d(TAG, "usb:UsbHostManager.beginUsbDeviceAdded(" + deviceName + ")");
@@ -149,9 +149,12 @@ public class UsbHostManager {
return false;
}
+ // Create version string in "%.%" format
+ String versionString = Integer.toString(version >> 8) + "." + (version & 0xFF);
+
mNewDevice = new UsbDevice(deviceName, vendorID, productID,
deviceClass, deviceSubclass, deviceProtocol,
- manufacturerName, productName, serialNumber);
+ manufacturerName, productName, versionString, serialNumber);
mNewConfigurations = new ArrayList<UsbConfiguration>();
mNewInterfaces = new ArrayList<UsbInterface>();