diff options
| author | 2017-07-06 16:52:04 +0000 | |
|---|---|---|
| committer | 2017-07-06 16:52:04 +0000 | |
| commit | b60c48a6a2c5cf3f20ff2c20bf930e069afd2f01 (patch) | |
| tree | 647a42877fafd68b16b9edeeb9d39fd213345555 /services/usb/java | |
| parent | 789f10fe12ccda4d313b9f1193c28ebc4e09eda5 (diff) | |
| parent | 885b9e7133438e0ccfb782b62f0e93cae5b39d60 (diff) | |
Merge "Broadcast only if boot complete" into oc-dr1-dev
Diffstat (limited to 'services/usb/java')
| -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 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); } |