diff options
| author | 2019-07-10 10:25:07 -0700 | |
|---|---|---|
| committer | 2019-07-10 10:25:07 -0700 | |
| commit | c726e2058e2b5348d0a0c6594278683e74c14e01 (patch) | |
| tree | b1b138f8349ed4152f6fc907e0949e6fd02c70e5 | |
| parent | dfe3c57028c3e4e154c94aa2080aab870652f570 (diff) | |
| parent | fb717b6ab26aefc6a96525d910b72bb25fe9449d (diff) | |
Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181
am: fb717b6ab2
Change-Id: I34846199e446031423b767aa66b1bd2987cf6d4c
| -rw-r--r-- | services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 5b7d81697c8c..45b840ca976a 100644 --- 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: |