Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function"

2017-03-28 18:41:59 +00:00
parent 999a6d0024 4b3e46c787
commit a0360e38ab
1 changed files with 5 additions and 2 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -570,8 +570,11 @@ public class UsbDeviceManager {
                // Set the new USB configuration.
                setUsbConfig(functions);

-                // Start up dependent services.
-                updateUsbStateBroadcastIfNeeded(true);
+                if (UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_MTP)
+                        || UsbManager.containsFunction(functions, UsbManager.USB_FUNCTION_PTP)) {
+                    // Start up dependent services.
+                    updateUsbStateBroadcastIfNeeded(true);
+                }

                if (!waitForState(functions)) {
                    Slog.e(TAG, "Failed to switch USB config to " + functions);