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

Commit f874fd31 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents a44c50f3 ad962a92

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 {