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

Commit dabd6b8f authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

Restart USB stack only if data is unlocked 

When switching users, USB stack shouldn't be restarted if mUsbDataUnlocked =
false, e.g. device is in charge only mode.

Bug: 24611765
Change-Id: I3b12f8c8926235546fe916a200aa57ed618193de
parent e81b323a

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

+1 −1
Original line number Diff line number Diff line
@@ -753,7 +753,7 @@ public class UsbDeviceManager { 
                                        UsbManager.USB_FUNCTION_MTP)

                                || UsbManager.containsFunction(mCurrentFunctions,

                                        UsbManager.USB_FUNCTION_PTP);

                        if (active && mCurrentUser != UserHandle.USER_NULL) {

                        if (mUsbDataUnlocked && active && mCurrentUser != UserHandle.USER_NULL) {

                            Slog.v(TAG, "Current user switched to " + mCurrentUser

                                    + "; resetting USB host stack for MTP or PTP");

                            setEnabledFunctions(mCurrentFunctions, true);