diff options
| author | Nick Kralevich <nnk@google.com> | 2015-10-29 21:30:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-10-29 21:30:59 +0000 |
| commit | aa330c0dc2331f099ce05ecd76d56b8c9e9c483d (patch) | |
| tree | 9e76eb87ccaf2662a226cfb8b04c665cd243f995 /services | |
| parent | 57e5d5836c808de85b460af186d1553709a337d4 (diff) | |
| parent | 5701321701a319d3f2d98365a82266eeddaed895 (diff) | |
| download | frameworks_base-aa330c0dc2331f099ce05ecd76d56b8c9e9c483d.zip frameworks_base-aa330c0dc2331f099ce05ecd76d56b8c9e9c483d.tar.gz frameworks_base-aa330c0dc2331f099ce05ecd76d56b8c9e9c483d.tar.bz2 | |
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
am: 5701321701
* commit '5701321701a319d3f2d98365a82266eeddaed895':
UsbDeviceManager: set mUsbDataUnlocked=false on user switch
Diffstat (limited to 'services')
| -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 49062d0..81ca6a3 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -716,6 +716,8 @@ public class UsbDeviceManager { if (active && mCurrentUser != UserHandle.USER_NULL) { Slog.v(TAG, "Current user switched to " + mCurrentUser + "; resetting USB host stack for MTP or PTP"); + // avoid leaking sensitive data from previous user + mUsbDataUnlocked = false; setEnabledFunctions(mCurrentFunctions, true); } mCurrentUser = msg.arg1; |