UsbDeviceManager: set mUsbDataUnlocked=false on user switch am: 5701321701 am: aa330c0dc2

am: d33d66e26c

* commit 'd33d66e26ca53586a91201a69cf67eff61377def':
  UsbDeviceManager: set mUsbDataUnlocked=false on user switch

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;