diff options
| author | 2017-06-29 21:54:39 +0000 | |
|---|---|---|
| committer | 2017-06-29 21:54:39 +0000 | |
| commit | ed0cc81212c44f831aed19661a4377ff99cdb60c (patch) | |
| tree | 846ee9e8409d8e01e642be076eff6324ab0c06a6 | |
| parent | 266bd0d6cac294089ee1d8ab216d0d19a0d76c80 (diff) | |
| parent | dc0c14f169430915df4b9613f88264080ce5633c (diff) | |
Merge "Broadcast only if boot complete"
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 1a24d9571e72..a7180c989a6e 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -683,8 +683,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); } |