commit fb32790adc9ed647ad4e77c9613a860f9b76e855
author Sanket Padawe <sanketpadawe@google.com> Tue Jun 02 23:04:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 02 23:04:24 2015 +0000
tree 7d3b599e4d415838d653f140d3e82f01300f5125
parent 6a05116804c9b849bf3aa634df3e90cc216abc88
parent 0da0573b7015f76c0fd5563bbba594ba3219f548

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

src/com/android/settings/bluetooth/DeviceProfilesSettings.java

diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index df66a07..5dd7098 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -263,7 +263,6 @@
         } else {
             if (profile instanceof MapProfile) {
                 mCachedDevice.setMessagePermissionChoice(BluetoothDevice.ACCESS_ALLOWED);
-                refreshProfilePreference(profilePref, profile);
             }
             if (profile.isPreferred(device)) {
                 // profile is preferred but not connected: disable auto-connect
@@ -271,12 +270,12 @@
                     mCachedDevice.connectProfile(profile);
                 } else {
                     profile.setPreferred(device, false);
-                    refreshProfilePreference(profilePref, profile);
                 }
             } else {
                 profile.setPreferred(device, true);
                 mCachedDevice.connectProfile(profile);
             }
+            refreshProfilePreference(profilePref, profile);
         }
     }