commit b6ee8483bbaaadd0effe617198899bd09be2572b
author Nick Kralevich <nnk@google.com> Sat Jun 13 03:43:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jun 13 03:43:23 2015 +0000
tree 4b72b2aa61b5b4342d8e9aef7b14e7e47fc42b44
parent 3cb9434ca17987148851daf16cbac2428d650e64
parent e10831550ede1de3e0e00cb6d4a82319765c1f67

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

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: