diff options
| author | Mike Lockwood <lockwood@google.com> | 2014-03-21 03:10:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-21 03:10:34 +0000 |
| commit | 0416faa2b2b14df2f9392937a61f2d182feaa9d5 (patch) | |
| tree | 3405af5250647de153ef34fb18d3068eb00c6981 /services/usb/java/com | |
| parent | c84b4d7ff20c21aa3658c81c18546a74921be441 (diff) | |
| parent | 7a07f4d4ad1f2f4893223693aece62f095ce004e (diff) | |
| download | frameworks_base-0416faa2b2b14df2f9392937a61f2d182feaa9d5.zip frameworks_base-0416faa2b2b14df2f9392937a61f2d182feaa9d5.tar.gz frameworks_base-0416faa2b2b14df2f9392937a61f2d182feaa9d5.tar.bz2 | |
am 7a07f4d4: am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A better fix for race condition when starting USB accessory mode" into klp-dev
* commit '7a07f4d4ad1f2f4893223693aece62f095ce004e':
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 b925856..502ee18 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -534,7 +534,6 @@ public class UsbDeviceManager { if (mConfigured && enteringAccessoryMode) { // successfully entered accessory mode - mAccessoryModeRequestTime = 0; if (mAccessoryStrings != null) { mCurrentAccessory = new UsbAccessory(mAccessoryStrings); |