summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-08-02 12:56:56 -0400
committerMike Lockwood <lockwood@android.com>2011-08-02 12:56:56 -0400
commit688605ec02f99ecd424aeaf31f5e966bbee5f6be (patch)
treea8f55d88c7db0bb587ca405db9700ea7e35fa9a5 /src
parent7bdf78d56bdeb1a559769c7d354693100f1d5478 (diff)
downloadpackages_apps_settings-688605ec02f99ecd424aeaf31f5e966bbee5f6be.zip
packages_apps_settings-688605ec02f99ecd424aeaf31f5e966bbee5f6be.tar.gz
packages_apps_settings-688605ec02f99ecd424aeaf31f5e966bbee5f6be.tar.bz2
USB: Fix problem updating status of MTP/PTP checkboxes
Change-Id: Idc12e8cce2cde6aca71e05943e2f2d9a0becce6c Bug: 5108883 Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'src')
-rw-r--r--src/com/android/settings/deviceinfo/UsbSettings.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/deviceinfo/UsbSettings.java b/src/com/android/settings/deviceinfo/UsbSettings.java
index 8dea47f..538cde7 100644
--- a/src/com/android/settings/deviceinfo/UsbSettings.java
+++ b/src/com/android/settings/deviceinfo/UsbSettings.java
@@ -95,10 +95,11 @@ public class UsbSettings extends SettingsPreferenceFragment {
}
private void updateToggles() {
- if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) {
+ String function = mUsbManager.getDefaultFunction();
+ if (UsbManager.USB_FUNCTION_MTP.equals(function)) {
mMtp.setChecked(true);
mPtp.setChecked(false);
- } else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) {
+ } else if (UsbManager.USB_FUNCTION_PTP.equals(function)) {
mMtp.setChecked(false);
mPtp.setChecked(true);
} else {
@@ -109,7 +110,6 @@ public class UsbSettings extends SettingsPreferenceFragment {
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- Log.d(TAG, "onPreferenceTreeClick " + preference);
// temporary hack - using check boxes as radio buttons
// don't allow unchecking them