summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-06-13 03:12:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-13 03:12:27 +0000
commit9405a81f7ac4116e2715f5739fb5d7fd5c6458d8 (patch)
treea65fd9225a45a42bee1655334bf32b94c2b086be
parent64a8032f44da51d0422cb52af4631c7ae2545731 (diff)
parent2d0f6a9d360f4ac2de9473d1d0d9dd736aa408ff (diff)
downloadpackages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.zip
packages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.tar.gz
packages_apps_Settings-9405a81f7ac4116e2715f5739fb5d7fd5c6458d8.tar.bz2
Merge "Let UsbDeviceManager choose the appropriate function default" into mnc-dev
-rw-r--r--src/com/android/settings/deviceinfo/UsbModeChooserActivity.java2
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 a6af01a..268f87d 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: