diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-21 01:14:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 01:14:15 +0000 |
| commit | 1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b (patch) | |
| tree | 64447c13015e781fe87871667c2e2858a603cdc0 /services/usb/java/com | |
| parent | aa7e396f44f9b3b12a6abc9d8d62cf3a6f17527b (diff) | |
| parent | 71060db65e0e1c903b429c932cd6e27beec10a3e (diff) | |
| download | frameworks_base-1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b.zip frameworks_base-1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b.tar.gz frameworks_base-1fe28b20f1cfc6d2542f8b0bfe48355f3a58067b.tar.bz2 | |
am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '71060db65e0e1c903b429c932cd6e27beec10a3e':
UsbDeviceManager: A better fix for race condition when starting USB accessory mode
Diffstat (limited to 'services/usb/java/com')
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index bef33b9..76a8d17 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -538,7 +538,6 @@ public class UsbDeviceManager { if (mConfigured && enteringAccessoryMode) { // successfully entered accessory mode - mAccessoryModeRequestTime = 0; if (mAccessoryStrings != null) { mCurrentAccessory = new UsbAccessory(mAccessoryStrings); |