diff options
| author | Vinit Deshpande <vinitd@google.com> | 2015-07-09 16:53:12 -0700 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2015-07-10 10:39:16 -0700 |
| commit | 5b7352cf1bdcede7d018f9bb94667593b11b77c0 (patch) | |
| tree | cd0cb6401a23c827b6e6f70ff202faa28271dcb9 /packages | |
| parent | 1cb0de17a9a4de137247f7bf69ec44a83e30efa2 (diff) | |
| download | frameworks_base-5b7352cf1bdcede7d018f9bb94667593b11b77c0.zip frameworks_base-5b7352cf1bdcede7d018f9bb94667593b11b77c0.tar.gz frameworks_base-5b7352cf1bdcede7d018f9bb94667593b11b77c0.tar.bz2 | |
Fix multiple SSIDs for same Passpoint issues
This change fixes Wifi Settings UI for passpoint. The
connected notification now should show up only for the
SSIDs that match.
Bug: 22200890
Change-Id: If69a9364eca5505fe2d4037217f1777fa4d823f5
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 9325246..07edd33 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -624,9 +624,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. |