Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181

am: fb717b6ab2 Change-Id: I34846199e446031423b767aa66b1bd2987cf6d4c
2019-07-10 10:25:07 -07:00
parent dfe3c57028 fb717b6ab2
commit c726e2058e
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: