From dc0c14f169430915df4b9613f88264080ce5633c Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Thu, 29 Jun 2017 11:11:52 -0700 Subject: Broadcast only if boot complete Accessory connects / disconnects can occur before boot complete, so don't broadcast intents if that is the case. Bug: 63114621 Test: connect/disconnect an accessory Change-Id: Ib8f9eb97ce1630004511fcc1fb84594ccc812c06 --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'services/usb/java') diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 42272fddb95b..b0fefc494037 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -693,8 +693,9 @@ public class UsbDeviceManager { // Set the new USB configuration. setUsbConfig(oemFunctions); - if (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP) - || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP)) { + if (mBootCompleted + && (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP) + || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP))) { // Start up dependent services. updateUsbStateBroadcastIfNeeded(true); } -- cgit v1.2.3-59-g8ed1b