diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-07-13 23:02:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-13 23:02:36 +0000 |
| commit | 3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2 (patch) | |
| tree | c8b923d4f1090d25a54b206387def90c2890d852 /packages/SettingsLib | |
| parent | a95d9f0b725f7f462b27c0740936861438a1416b (diff) | |
| parent | 0bd08fc22ae457791d95a4d557051e6601516bd0 (diff) | |
| download | frameworks_base-3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2.zip frameworks_base-3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2.tar.gz frameworks_base-3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2.tar.bz2 | |
am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
* commit '0bd08fc22ae457791d95a4d557051e6601516bd0':
Fix multiple SSIDs for same Passpoint issues
Diffstat (limited to 'packages/SettingsLib')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 048fb9a..348d0ec 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -625,9 +625,13 @@ public class AccessPoint implements Comparable<AccessPoint> { mNetworkInfo != null && mNetworkInfo.getState() != State.DISCONNECTED; } + public boolean isPasspoint() { + return mConfig != null && mConfig.isPasspoint(); + } + /** Return whether the given {@link WifiInfo} is for this access point. */ private boolean isInfoForThisAccessPoint(WifiInfo info) { - if (networkId != WifiConfiguration.INVALID_NETWORK_ID) { + if (isPasspoint() == false && networkId != WifiConfiguration.INVALID_NETWORK_ID) { return networkId == info.getNetworkId(); } else { // Might be an ephemeral connection with no WifiConfiguration. Try matching on SSID. |