diff options
| author | 2017-05-12 20:31:51 +0000 | |
|---|---|---|
| committer | 2017-05-12 20:31:51 +0000 | |
| commit | 653fbeeec4b8f42787d480c2b0a0e9c5f479202a (patch) | |
| tree | 8334f8dc8710dd20f1651cb5b059de52d3f37f47 /services/usb/java | |
| parent | e088e568f263c5a44b08b435675f8591223e6ad6 (diff) | |
| parent | c5a4576cab99dc52d077ff8190cd622b3d10adc3 (diff) | |
Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev am: f874fd319e
am: c5a4576cab
Change-Id: I153a5ad3e4bd0de9a62ef39ebc7579f4916b79e3
Diffstat (limited to 'services/usb/java')
| -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 857d07a9ca3d..6dfd08570b18 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -906,7 +906,7 @@ public class UsbDeviceManager { if (!mConnected) { // restore defaults when USB is disconnected Slog.i(TAG, "Disconnect, setting usb functions to null"); - setEnabledFunctions(null, true, false); + setEnabledFunctions(null, !mAdbEnabled, false); } updateUsbFunctions(); } else { |