diff options
| author | a.lukianenko <a.lukianenko@globallogic.com> | 2019-07-10 10:34:23 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-10 10:34:23 -0700 |
| commit | d1ce8ebd20001d014e52040b04787f1972d48167 (patch) | |
| tree | a845022d978df9de2ffd2a98b34bc1f2c66b0704 /services/usb/java | |
| parent | e4579b2a49705c2fbf9622740b2a8b4bc097cb2b (diff) | |
| parent | c726e2058e2b5348d0a0c6594278683e74c14e01 (diff) | |
Merge "Fixing 'No data transfer' mode in USB configuration" am: e8da6089ac am: 0df2517181 am: fb717b6ab2
am: c726e2058e
Change-Id: Ibe40e68ed21615d8fa12137ecc9e7774137fde5b
Diffstat (limited to 'services/usb/java')
| -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 7c4198857b5e..7f7a78bd1d17 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: |