Merge "Only force reset when adb is not enabled (i.e. mtp is)" into oc-dev

am: f874fd319e Change-Id: I752aaae79bb2081add616d8183000ff63c6bf352
2017-05-12 19:50:20 +00:00
parent e9479a21b5 f874fd319e
commit c5a4576cab
1 changed files with 1 additions and 1 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -855,7 +855,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 {