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" into nyc-mr2-dev

Browse Source
This commit is contained in:
Jerry Zhang
2017-01-25 20:30:17 +00:00
committed by Android (Google) Code Review
parent bd16255ee1 a291336bd8
commit 361a3e2090
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

@@ -1707,11 +1707,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private void writeUsbConfigurationOption(Object newValue) {
UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE);
String function = newValue.toString();
manager.setCurrentFunction(function);
if (function.equals("none")) {
manager.setUsbDataUnlocked(false);
manager.setCurrentFunction(function, false);
} 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) {
switch (mode) {
case MODE_DATA_MTP:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
mUsbManager.setUsbDataUnlocked(true);
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP, true);
break;
case MODE_DATA_PTP:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP);
mUsbManager.setUsbDataUnlocked(true);
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP, true);
break;
case MODE_DATA_MIDI:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI);
mUsbManager.setUsbDataUnlocked(true);
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI, true);
break;
default:
mUsbManager.setCurrentFunction(null);
mUsbManager.setUsbDataUnlocked(false);
mUsbManager.setCurrentFunction(null, false);
break;
}
}