Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5a4576c authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

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

am: f874fd31

Change-Id: I752aaae79bb2081add616d8183000ff63c6bf352
parents e9479a21 f874fd31

services/usb/java/com/android/server/usb/UsbDeviceManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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 {