commit 2d2346e0948f5abfc502b90997ee377e0f261863
author Jerry Zhang <zhangjerry@google.com> Mon Oct 17 17:39:19 2016 -0700
committer Jerry Zhang <zhangjerry@google.com> Mon Oct 17 17:41:36 2016 -0700
tree 25bf253eeff64ec86eef97132ac06794aecebad4
parent a45dac0e83f4f907b6b42f453181a7d5c01f65f3

Revert: Remove the kick from config switches in UsbDeviceManager

Test: Manual
Bug: 32197840
Change-Id: Id2e939a57e170fbb4c06e55dc79c5d35ce95486f

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 43097b9..af8c314 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -560,6 +560,9 @@
                 mCurrentFunctions = functions;
                 mCurrentFunctionsApplied = false;
 
+                // Kick the USB stack to close existing connections.
+                setUsbConfig(UsbManager.USB_FUNCTION_NONE);
+
                 // Set the new USB configuration.
                 if (!setUsbConfig(functions)) {
                     Slog.e(TAG, "Failed to switch USB config to " + functions);