commit 0015a153536c51cdd66dce5e9f08d19eb517fab8
author Jerry Zhang <zhangjerry@google.com> Mon Apr 10 18:51:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 10 18:52:00 2017 +0000
tree 1a814e9bcca88d53cb3d68266d2040a32b89e316
parent d4011635995d6f0b8975e65a3bfa95d4f10f0606
parent 6040887f78c1a5d8911a169cd4f2825cf8bad10c

Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev

services/usb/java/com/android/server/usb/UsbDeviceManager.java

diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index b5a87ca..80b73d3 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -640,8 +640,11 @@
                 // Set the new USB configuration.
                 setUsbConfig(oemFunctions);
 
-                // 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(oemFunctions)) {
                     Slog.e(TAG, "Failed to switch USB config to " + functions);