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

am: a0360e38ab

Change-Id: I862f38f52cef8b2b90125953593774263b862306

1 files changed, 5 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 a38432461f6d..b9d22e84a88b 100644
--- 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);