am a0918440: am f35bd641: am b8b20a50: Merge "Fix USB mode development setting" into mnc-dev

* commit 'a0918440803bcfa1d28472d70dd0e37ca79814fb':
  Fix USB mode development setting
This commit is contained in:
Marco Nelissen
2015-07-04 08:04:30 +00:00
committed by Android Git Automerger

View File

@@ -1352,7 +1352,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
private void writeUsbConfigurationOption(Object newValue) { private void writeUsbConfigurationOption(Object newValue) {
UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE); 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() { private void updateCpuUsageOptions() {