PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor setCurrentFunction and setUsbDataUnlocked into one method"

Browse Source
This commit is contained in:
Jerry Zhang
2016-11-16 23:59:32 +00:00
committed by Gerrit Code Review
parent b4b2c2aa43 a1b60e629f
commit 89a055aa9d
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/DevelopmentSettings.java
View File

@@ -1704,11 +1704,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
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);
String function = newValue.toString(); String function = newValue.toString();
manager.setCurrentFunction(function);
if (function.equals("none")) { if (function.equals("none")) {
manager.setUsbDataUnlocked(false); manager.setCurrentFunction(function, false);
} else { } else {
manager.setUsbDataUnlocked(true); manager.setCurrentFunction(function, true);
} }
} }

12
src/com/android/settings/deviceinfo/UsbBackend.java
View File

@@ -101,20 +101,16 @@ public class UsbBackend {
private void setUsbFunction(int mode) { private void setUsbFunction(int mode) {
switch (mode) { switch (mode) {
case MODE_DATA_MTP: case MODE_DATA_MTP:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
mUsbManager.setUsbDataUnlocked(true);
break; break;
case MODE_DATA_PTP: case MODE_DATA_PTP:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
mUsbManager.setUsbDataUnlocked(true);
break; break;
case MODE_DATA_MIDI: case MODE_DATA_MIDI:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI, true);
mUsbManager.setUsbDataUnlocked(true);
break; break;
default: default:
mUsbManager.setCurrentFunction(null); mUsbManager.setCurrentFunction(null, false);
mUsbManager.setUsbDataUnlocked(false);
break; break;
} }
} }