am e1083155: am bc8985c6: am 9405a81f: Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev

* commit 'e10831550ede1de3e0e00cb6d4a82319765c1f67':
  Let UsbDeviceManager choose the appropriate function default
This commit is contained in:
Nick Kralevich
2015-06-13 03:43:23 +00:00
committed by Android Git Automerger

View File

@@ -95,7 +95,7 @@ public class UsbModeChooserActivity extends Activity {
private void setCurrentFunction(int which) {
switch (which) {
case 0:
mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
mUsbManager.setCurrentFunction(null);
mUsbManager.setUsbDataUnlocked(false);
break;
case 1: