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

am: c726e2058e Change-Id: Ibe40e68ed21615d8fa12137ecc9e7774137fde5b
2019-07-10 10:34:23 -07:00
parent e4579b2a49 c726e2058e
commit d1ce8ebd20
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: