From 1357f7a70fe54c093f287d24bbb3e6676aef6970 Mon Sep 17 00:00:00 2001 From: "a.lukianenko" Date: Mon, 24 Jun 2019 13:32:48 +0300 Subject: [PATCH] Fixing 'No data transfer' mode in USB configuration If 'No data transfer' mode is chosen after any other mode nothing happens, because in case of sending 'MSG_SET_SCREEN_UNLOCKED_FUNCTIONS' message no actions are taken to usbData. Signed-off-by: a.lukianenko Change-Id: I7c17a0a4275692022119a48b6d6c1550553fdceb --- services/usb/java/com/android/server/usb/UsbDeviceManager.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index e949e74902302..655363efd2e0e 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -922,6 +922,8 @@ public class UsbDeviceManager implements ActivityManagerInternal.ScreenObserver 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: