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

Commit 653fbeee 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 

am: c5a4576c

Change-Id: I153a5ad3e4bd0de9a62ef39ebc7579f4916b79e3
parents e088e568 c5a4576c

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

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