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

am 8da8e528: Merge "Fix USB access control when adb is disabled." into mnc-dev

Browse Source 
* commit '8da8e528748fccf4b2291536592648a8e99a36d6':
  Fix USB access control when adb is disabled.
This commit is contained in:
Nick Kralevich
2015-06-10 21:25:35 +00:00
committed by Android Git Automerger
parent c58845442a 8da8e52874
commit d9bd6a6576
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
View File

@@ -76,7 +76,9 @@ public class UsbModeChooserActivity extends Activity {
* so that everything matches. * so that everything matches.
*/ */
private int getCurrentFunction() { private int getCurrentFunction() {
if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) { if (!mUsbManager.isUsbDataUnlocked()) {
return 0;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
return 1; return 1;
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) { } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
return 2; return 2;
@@ -93,16 +95,20 @@ public class UsbModeChooserActivity extends Activity {
private void setCurrentFunction(int which) { private void setCurrentFunction(int which) {
switch (which) { switch (which) {
case 0: case 0:
mUsbManager.setCurrentFunction("none"); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
mUsbManager.setUsbDataUnlocked(false);
break; break;
case 1: case 1:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
mUsbManager.setUsbDataUnlocked(true);
break; break;
case 2: case 2:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_PTP);
mUsbManager.setUsbDataUnlocked(true);
break; break;
case 3: case 3:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI); mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MIDI);
mUsbManager.setUsbDataUnlocked(true);
break; break;
} }
} }