commit bc8985c6ee49e0feff3a48c399a03d8d882ea6bc
author Nick Kralevich <nnk@google.com> Sat Jun 13 03:19:37 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 03:19:37 2015 +0000
tree 8d0d3e01f9caebfe31f94cc2424c1ab6553d08c2
parent 20a0da89089984b12805b707c8644bb4413389c4
parent 9405a81f7ac4116e2715f5739fb5d7fd5c6458d8

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

* commit '9405a81f7ac4116e2715f5739fb5d7fd5c6458d8':
  Let UsbDeviceManager choose the appropriate function default

src/com/android/settings/deviceinfo/UsbModeChooserActivity.java

diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
index a6af01a..268f87d 100644
--- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
+++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java
@@ -95,7 +95,7 @@
     private void setCurrentFunction(int which) {
         switch (which) {
             case 0:
-                mUsbManager.setCurrentFunction(UsbManager.USB_FUNCTION_MTP);
+                mUsbManager.setCurrentFunction(null);
                 mUsbManager.setUsbDataUnlocked(false);
                 break;
             case 1: