summaryrefslogtreecommitdiff
path: root/services/usb/java
diff options
context:
space:
mode:
authora.lukianenko <a.lukianenko@globallogic.com>2019-06-24 13:32:48 +0300
committerAnastasiia Lukianenko <a.lukianenko@globallogic.com>2019-07-05 10:03:52 +0000
commit1357f7a70fe54c093f287d24bbb3e6676aef6970 (patch)
treefeeb726a201ff6065c50913edb48c527d1dfad37 /services/usb/java
parent073c203dae2743ee3d0531e711fbbbdef8d00cc3 (diff)
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 <a.lukianenko@globallogic.com> Change-Id: I7c17a0a4275692022119a48b6d6c1550553fdceb
Diffstat (limited to 'services/usb/java')
-rw-r--r--services/usb/java/com/android/server/usb/UsbDeviceManager.java2
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 e949e7490230..655363efd2e0 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: