Only send usb disconnect intents after boot. am: c1bc0a844d

am: dc9c094deb Change-Id: Icfadbbe67ef80977500916bcb84f0c7989941b7c
2017-01-31 00:58:14 +00:00
parent 2cf376459b dc9c094deb
commit 9877c70d9d
1 changed files with 4 additions and 3 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -740,11 +740,12 @@ public class UsbDeviceManager {
                    if (UsbManager.containsFunction(mCurrentFunctions,
                            UsbManager.USB_FUNCTION_ACCESSORY)) {
                        updateCurrentAccessory();
-                    } else if (!mConnected) {
-                        // restore defaults when USB is disconnected
-                        setEnabledFunctions(null, false, false);
                    }
                    if (mBootCompleted) {
+                        if (!mConnected) {
+                            // restore defaults when USB is disconnected
+                            setEnabledFunctions(null, false, false);
+                        }
                        updateUsbStateBroadcastIfNeeded(false);
                        updateUsbFunctions();
                    }