Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a07f4d4 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am a5853b17: am 1fe28b20: am 71060db6: am dffdf107: Merge "UsbDeviceManager: A... 

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 'a5853b17':
  UsbDeviceManager: A better fix for race condition when starting USB accessory mode
parents e920322f a5853b17

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+0 −1
Original line number Diff line number Diff line
@@ -538,7 +538,6 @@ public class UsbDeviceManager { 


            if (mConfigured && enteringAccessoryMode) {

                // successfully entered accessory mode

                mAccessoryModeRequestTime = 0;



                if (mAccessoryStrings != null) {

                    mCurrentAccessory = new UsbAccessory(mAccessoryStrings);