Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 706ad39b authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android Git Automerger
Browse files

am a2de7fc9: Merge "Prevent accidental unlocking of USB data transfer." into mnc-dev 

* commit 'a2de7fc9':
  Prevent accidental unlocking of USB data transfer.
parents 30871415 a2de7fc9

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

+7 −0
Original line number Diff line number Diff line
@@ -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);

    }