diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-21 01:14:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 01:14:18 +0000 |
| commit | 4475a36804f3bfe86a08126f0f18bd2257b5730a (patch) | |
| tree | a634ed426a1049e2b869919a833f960361e85caf /services/java | |
| parent | 0796ba8d7671de335cc08ab453c976f2fe78d67c (diff) | |
| parent | 71060db65e0e1c903b429c932cd6e27beec10a3e (diff) | |
| download | frameworks_base-4475a36804f3bfe86a08126f0f18bd2257b5730a.zip frameworks_base-4475a36804f3bfe86a08126f0f18bd2257b5730a.tar.gz frameworks_base-4475a36804f3bfe86a08126f0f18bd2257b5730a.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/java')
| -rw-r--r-- | services/java/com/android/server/usb/UsbDeviceManager.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/services/java/com/android/server/usb/UsbDeviceManager.java b/services/java/com/android/server/usb/UsbDeviceManager.java index 8a5e291..bb61e49 100644 --- a/services/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/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); |