Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2fbfe429: am 92c1d283: am 706ad39b: am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev

Browse Source 
* commit '2fbfe42955520c6831fd5df94d87ada875f9299b':
  Prevent accidental unlocking of USB data transfer.
This commit is contained in:
Zoltan Szatmary-Ban
2015-07-08 12:55:25 +00:00
committed by Android Git Automerger
parent 55a3a23307 2fbfe42955
commit 032ba9f3d1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/usb/java/com/android/server/usb/UsbService.java
View File

@@ -273,6 +273,13 @@ public class UsbService extends IUsbManager.Stub {
@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);
}