diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-07-13 19:46:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-13 19:46:27 +0000 |
| commit | 0bd08fc22ae457791d95a4d557051e6601516bd0 (patch) | |
| tree | a7cd9974cfaf434b0b5ca762480c1a992d0fa4e0 /packages | |
| parent | 16c1764cf552432d304eaefd912d5aebe3192449 (diff) | |
| parent | 5b7352cf1bdcede7d018f9bb94667593b11b77c0 (diff) | |
| download | frameworks_base-0bd08fc22ae457791d95a4d557051e6601516bd0.zip frameworks_base-0bd08fc22ae457791d95a4d557051e6601516bd0.tar.gz frameworks_base-0bd08fc22ae457791d95a4d557051e6601516bd0.tar.bz2 | |
Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev
Diffstat (limited to 'packages')
| -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. |