diff options
| author | Marco Nelissen <marcone@google.com> | 2015-06-30 14:52:04 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-07-01 15:44:32 +0000 |
| commit | e6ffe317547abc583742a02a9272e421c3fe4efb (patch) | |
| tree | 632143dfe9f63e6f44921bdcabf1106faa33c446 /src/com/android/settings/DevelopmentSettings.java | |
| parent | 21e00f9819f48d33958a1bda87511e38809eb9f3 (diff) | |
| download | packages_apps_Settings-e6ffe317547abc583742a02a9272e421c3fe4efb.zip packages_apps_Settings-e6ffe317547abc583742a02a9272e421c3fe4efb.tar.gz packages_apps_Settings-e6ffe317547abc583742a02a9272e421c3fe4efb.tar.bz2 | |
Fix USB mode development setting
USB mode consists of the function (mtp, ptp, midi, etc) and the data
locked/unlocked state. Developer settings was only setting the
function, leaving data locked when it should be unlocked.
Bug: 22165902
Change-Id: Ia1ae8dfaf3d2abc62034aa6aea1234bad04aaa2e
Diffstat (limited to 'src/com/android/settings/DevelopmentSettings.java')
| -rw-r--r-- | src/com/android/settings/DevelopmentSettings.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java index 5d9e2bd..f20728a 100644 --- a/src/com/android/settings/DevelopmentSettings.java +++ b/src/com/android/settings/DevelopmentSettings.java @@ -1326,7 +1326,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment private void writeUsbConfigurationOption(Object newValue) { UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE); - manager.setCurrentFunction(newValue.toString()); + String function = newValue.toString(); + manager.setCurrentFunction(function); + if (function.equals("none")) { + manager.setUsbDataUnlocked(false); + } else { + manager.setUsbDataUnlocked(true); + } } private void updateCpuUsageOptions() { |