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

* commit 'b8b20a503255da8097d64a2f1554d118f8e3c424':
  Fix USB mode development setting
This commit is contained in:
Marco Nelissen
2015-07-02 00:46:53 +00:00
committed by Android Git Automerger

View File

@@ -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() {