Merge "Fix issue where connected network sometimes doesn't update." into oc-mr1-dev

am: 51bde3c8fe

Change-Id: Ie9139274f1c472baa87121d5a6faf8c2b40b6a3f
This commit is contained in:
Eric Schwarzenbach
2017-08-09 20:02:03 +00:00
committed by android-build-merger

View File

@@ -857,10 +857,11 @@ public class WifiSettings extends RestrictedSettingsFragment
}
// Is the previous currently connected SSID different from the new one?
if (!((AccessPointPreference)
mConnectedAccessPointPreferenceCategory.getPreference(0))
.getAccessPoint().getSsidStr().equals(
connectedAp.getSsidStr())) {
AccessPointPreference preference = (AccessPointPreference)
(mConnectedAccessPointPreferenceCategory.getPreference(0));
// The AccessPoints need to be the same reference to ensure that updates are reflected
// in the UI.
if (preference.getAccessPoint() != connectedAp) {
removeConnectedAccessPointPreference();
addConnectedAccessPointPreference(connectedAp);
return true;