From 5b7352cf1bdcede7d018f9bb94667593b11b77c0 Mon Sep 17 00:00:00 2001 From: Vinit Deshpande Date: Thu, 9 Jul 2015 16:53:12 -0700 Subject: 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 --- .../SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 { 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. -- cgit v1.1