diff options
| author | 2015-10-02 15:41:46 -0700 | |
|---|---|---|
| committer | 2015-10-02 15:41:46 -0700 | |
| commit | dabd6b8f45e464a83fee96c69076abb78dbc862f (patch) | |
| tree | ea142001816e71179d3df370d105cdc943bedecb | |
| parent | e81b323af1cea0cbba80171968c27f6023ffc7e0 (diff) | |
Restart USB stack only if data is unlocked
When switching users, USB stack shouldn't be restarted if mUsbDataUnlocked =
false, e.g. device is in charge only mode.
Bug: 24611765
Change-Id: I3b12f8c8926235546fe916a200aa57ed618193de
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 7f813ec59313..3160e3961495 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -753,7 +753,7 @@ public class UsbDeviceManager { UsbManager.USB_FUNCTION_MTP) || UsbManager.containsFunction(mCurrentFunctions, UsbManager.USB_FUNCTION_PTP); - if (active && mCurrentUser != UserHandle.USER_NULL) { + if (mUsbDataUnlocked && active && mCurrentUser != UserHandle.USER_NULL) { Slog.v(TAG, "Current user switched to " + mCurrentUser + "; resetting USB host stack for MTP or PTP"); setEnabledFunctions(mCurrentFunctions, true); |