Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev

This commit is contained in:
Sanket Padawe
2015-06-02 23:04:23 +00:00
committed by Android (Google) Code Review

View File

@@ -263,7 +263,6 @@ public final class DeviceProfilesSettings extends DialogFragment implements
} else { } else {
if (profile instanceof MapProfile) { if (profile instanceof MapProfile) {
mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED); mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
refreshProfilePreference(profilePref, profile);
} }
if (profile.isPreferred(device)) { if (profile.isPreferred(device)) {
// profile is preferred but not connected: disable auto-connect // profile is preferred but not connected: disable auto-connect
@@ -271,12 +270,12 @@ public final class DeviceProfilesSettings extends DialogFragment implements
mCachedDevice.connectProfile(profile); mCachedDevice.connectProfile(profile);
} else { } else {
profile.setPreferred(device, false); profile.setPreferred(device, false);
refreshProfilePreference(profilePref, profile);
} }
} else { } else {
profile.setPreferred(device, true); profile.setPreferred(device, true);
mCachedDevice.connectProfile(profile); mCachedDevice.connectProfile(profile);
} }
refreshProfilePreference(profilePref, profile);
} }
} }