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

am: e8da6089ac Change-Id: I7f0e03ccebb65e0c9a483adffc4af980ff164a3b
2019-07-10 09:59:06 -07:00
parent 53507c3423 e8da6089ac
commit 0df2517181
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
@@ -909,6 +909,8 @@ public class UsbDeviceManager implements ActivityTaskManagerInternal.ScreenObser
                    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: