Merge "Fixing 'No data transfer' mode in USB configuration"

2019-07-10 16:44:29 +00:00
parent c25ad64386 1357f7a70f
commit e8da6089ac
1 changed files with 2 additions and 0 deletions
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -922,6 +922,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver
                    if (!mScreenLocked && mScreenUnlockedFunctions != UsbManager.FUNCTION_NONE) {
                        // If the screen is unlocked, also set current functions.
                        setScreenUnlockedFunctions();
+                    } else {
+                        setEnabledFunctions(UsbManager.FUNCTION_NONE, false);
                    }
                    break;
                case MSG_UPDATE_SCREEN_LOCK: