From 6040887f78c1a5d8911a169cd4f2825cf8bad10c Mon Sep 17 00:00:00 2001 From: puma_hsu Date: Fri, 24 Mar 2017 10:41:56 +0800 Subject: Just broadcast intent to bring up MTP/PTP as soon as switching function Bug: 36113457 Bug: 34451451 Test: Turn on tethering Change-Id: I3a7ab6fdcd157740b8e55ded67b3d5dddf15b0e0 Signed-off-by: puma_hsu (cherry picked from commit 4b3e46c7878f28abe2f3c26c05d55c41eba41227) --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 7 +++++-- 1 file 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 b5a87ca8f110..80b73d3677b0 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 @@ public class UsbDeviceManager { // 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); -- cgit v1.2.3-59-g8ed1b