diff options
| author | Nick Kralevich <nnk@google.com> | 2015-05-13 11:54:03 -0700 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-05-13 14:28:13 -0700 |
| commit | fcf10f7c12cb3107bdfedce6f76a8c866d154f3c (patch) | |
| tree | 54e502f36ee820d1fc74cc52e653b7547801df41 /services/devicepolicy | |
| parent | 2047ce824030a2ea6227a7544789281530b7892d (diff) | |
| download | frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.zip frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.tar.gz frameworks_base-fcf10f7c12cb3107bdfedce6f76a8c866d154f3c.tar.bz2 | |
Modify how USB connections are handled.
* Introduce a new "charger only" mode. In this mode, MTP is disabled,
and no file transfers can occur.
* Make charger only mode the default.
* Modify "persist.sys.usb.config" so it now only holds the adb status.
* Make the USB settings non-persistent. Unplugging the USB connection will
reset the device back to "charger only" mode.
* Fixup wording per UI guidelines.
TODO: Re-implement MDM restrictions for USB / MTP access controls.
Bug: 18905620
Change-Id: I99a50d9132a81e98187f431166fd9fef4d437e4f
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ba5d666..aad8b57 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5362,7 +5362,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } else if (UserManager.DISALLOW_USB_FILE_TRANSFER.equals(key)) { UsbManager manager = (UsbManager) mContext.getSystemService(Context.USB_SERVICE); - manager.setCurrentFunction("none", false); + manager.setCurrentFunction("none"); } else if (UserManager.DISALLOW_SHARE_LOCATION.equals(key)) { Settings.Secure.putIntForUser(mContext.getContentResolver(), Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF, |