Only send usb disconnect intents after boot.

am: c1bc0a844d

Change-Id: Iaa8ff69de80b3efa558f82438cc6071f749a2dc8
This commit is contained in:
Jerry Zhang
2017-01-31 00:51:41 +00:00
committed by android-build-merger

View File

@@ -740,11 +740,12 @@ public class UsbDeviceManager {
if (UsbManager.containsFunction(mCurrentFunctions, if (UsbManager.containsFunction(mCurrentFunctions,
UsbManager.USB_FUNCTION_ACCESSORY)) { UsbManager.USB_FUNCTION_ACCESSORY)) {
updateCurrentAccessory(); updateCurrentAccessory();
} else if (!mConnected) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
} }
if (mBootCompleted) { if (mBootCompleted) {
if (!mConnected) {
// restore defaults when USB is disconnected
setEnabledFunctions(null, false, false);
}
updateUsbStateBroadcastIfNeeded(false); updateUsbStateBroadcastIfNeeded(false);
updateUsbFunctions(); updateUsbFunctions();
} }