diff options
| author | Nick Kralevich <nnk@google.com> | 2015-06-13 03:12:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-13 03:12:27 +0000 |
| commit | 9405a81f7ac4116e2715f5739fb5d7fd5c6458d8 (patch) | |
| tree | a65fd9225a45a42bee1655334bf32b94c2b086be /src/com/android/settings/deviceinfo | |
| parent | 64a8032f44da51d0422cb52af4631c7ae2545731 (diff) | |
| parent | 2d0f6a9d360f4ac2de9473d1d0d9dd736aa408ff (diff) | |
| download | packages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.tar.gz packages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.tar.bz2 packages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.zip | |
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
Diffstat (limited to 'src/com/android/settings/deviceinfo')
| -rw-r--r-- | src/com/android/settings/deviceinfo/UsbModeChooserActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java index a6af01ad5..268f87d5f 100644 --- a/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java +++ b/src/com/android/settings/deviceinfo/UsbModeChooserActivity.java @@ -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: |