USB: Fix problem updating status of MTP/PTP checkboxes

Change-Id: Idc12e8cce2cde6aca71e05943e2f2d9a0becce6c
Bug: 5108883

Signed-off-by: Mike Lockwood <lockwood@android.com>
This commit is contained in:
Mike Lockwood
2011-08-02 12:56:56 -04:00
parent 7bdf78d56b
commit 688605ec02

View File

@@ -95,10 +95,11 @@ public class UsbSettings extends SettingsPreferenceFragment {
} }
private void updateToggles() { private void updateToggles() {
if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_MTP)) { String function = mUsbManager.getDefaultFunction();
if (UsbManager.USB_FUNCTION_MTP.equals(function)) {
mMtp.setChecked(true); mMtp.setChecked(true);
mPtp.setChecked(false); mPtp.setChecked(false);
} else if (mUsbManager.isFunctionEnabled(UsbManager.USB_FUNCTION_PTP)) { } else if (UsbManager.USB_FUNCTION_PTP.equals(function)) {
mMtp.setChecked(false); mMtp.setChecked(false);
mPtp.setChecked(true); mPtp.setChecked(true);
} else { } else {
@@ -109,7 +110,6 @@ public class UsbSettings extends SettingsPreferenceFragment {
@Override @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
Log.d(TAG, "onPreferenceTreeClick " + preference);
// temporary hack - using check boxes as radio buttons // temporary hack - using check boxes as radio buttons
// don't allow unchecking them // don't allow unchecking them