diff options
| author | Nick Kralevich <nnk@google.com> | 2015-05-13 22:31:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 22:31:57 +0000 |
| commit | 9831fad6768135dbd982d6dca78d7f6de81bb320 (patch) | |
| tree | ef56029d39afbc3a6b4c8feb563997c49e6bd192 /services/devicepolicy | |
| parent | 645edef4834c2911386b659cc775840fb7479e01 (diff) | |
| parent | fcf10f7c12cb3107bdfedce6f76a8c866d154f3c (diff) | |
| download | frameworks_base-9831fad6768135dbd982d6dca78d7f6de81bb320.zip frameworks_base-9831fad6768135dbd982d6dca78d7f6de81bb320.tar.gz frameworks_base-9831fad6768135dbd982d6dca78d7f6de81bb320.tar.bz2 | |
Merge "Modify how USB connections are handled." into mnc-dev
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 822ffd3..8e4bc50 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -5403,7 +5403,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, |