commit b2eb6b9049567c134d7654f6cd79b4a47de643af
author Zoltan Szatmary-Ban <szatmz@google.com> Tue Jul 07 13:24:59 2015 +0100
committer Zoltan Szatmary-Ban <szatmz@google.com> Tue Jul 07 13:24:59 2015 +0100
tree 1e1f4afc41ff17dcbc7d83bd5640ec0f4675475e
parent b0b3d0bcfb0af678d4c85bec63722f976ffb01cf

Prevent accidental unlocking of USB data transfer.

When DISALLOW_USB_FILE_TRANSFER is in effect, there must be no chance to
unlock data transfer over USB.

Bug: 22291579
Change-Id: I990fedbfeecd90e7dd26981034d0352b83dc694e

services/usb/java/com/android/server/usb/UsbService.java

diff --git a/services/usb/java/com/android/server/usb/UsbService.java b/services/usb/java/com/android/server/usb/UsbService.java
index 7a3426c..987a79f 100644
--- a/services/usb/java/com/android/server/usb/UsbService.java
+++ b/services/usb/java/com/android/server/usb/UsbService.java
@@ -273,6 +273,13 @@
     @Override
     public void setUsbDataUnlocked(boolean unlocked) {
         mContext.enforceCallingOrSelfPermission(android.Manifest.permission.MANAGE_USB, null);
+        // If attempt to change USB function while file transfer is restricted, ensure that
+        // usb data is always locked, and return.
+        UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        if (userManager.hasUserRestriction(UserManager.DISALLOW_USB_FILE_TRANSFER)) {
+            if (mDeviceManager != null) mDeviceManager.setUsbDataUnlocked(false);
+            return;
+        }
         mDeviceManager.setUsbDataUnlocked(unlocked);
     }