Merge remote branch 'goog/ics-mr1' into ics-aah

2011-10-31 05:54:48 -07:00
parent 991e445900 8fd5e45052
commit a762e1d708
12 changed files with 50 additions and 34 deletions
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -332,7 +332,7 @@ public final class DeviceProfilesSettings extends SettingsPreferenceFragment
         * Gray out checkbox while connecting and disconnecting
         */
        profilePref.setEnabled(!mCachedDevice.isBusy());
-        profilePref.setChecked(mCachedDevice.isConnectedProfile(profile));
+        profilePref.setChecked(profile.isPreferred(device));
        profilePref.setSummary(profile.getSummaryResourceForDevice(device));
    }