diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-07-09 20:03:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-09 20:03:29 +0000 |
| commit | c1aebfa02c393471fb344c3a94ee2ae62bb78f93 (patch) | |
| tree | a7ad5a19b182f4e668f5e815f8c2c2e0c4219f5f /services/devicepolicy | |
| parent | 968f9fdf8b2042b4d7b408f4b2a9db5008eaca6e (diff) | |
| parent | 460a146eb8f827e4e70f2dd93d1ba852d0feb06b (diff) | |
| download | frameworks_base-c1aebfa02c393471fb344c3a94ee2ae62bb78f93.zip frameworks_base-c1aebfa02c393471fb344c3a94ee2ae62bb78f93.tar.gz frameworks_base-c1aebfa02c393471fb344c3a94ee2ae62bb78f93.tar.bz2 | |
Merge "Clean up USB Manager and fix ADB." into mnc-dev
Diffstat (limited to 'services/devicepolicy')
| -rw-r--r-- | services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ed4fe24..5d05f32 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -60,7 +60,6 @@ import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; import android.database.ContentObserver; import android.graphics.Bitmap; -import android.hardware.usb.UsbManager; import android.media.AudioManager; import android.media.IAudioService; import android.net.ConnectivityManager; @@ -5446,10 +5445,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { Settings.Secure.putIntForUser(mContext.getContentResolver(), Settings.Secure.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0, userHandle); - } else if (UserManager.DISALLOW_USB_FILE_TRANSFER.equals(key)) { - UsbManager manager = - (UsbManager) mContext.getSystemService(Context.USB_SERVICE); - 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, |