Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev

Browse Source 
* commit '3f96f8b2fff2a2a7dc0a44d5f1219da8d7f2a5c2':
  Fix multiple SSIDs for same Passpoint issues
This commit is contained in:
Vinit Deshpande
2015-07-13 23:36:17 +00:00
committed by Android Git Automerger
parent a984568022 3f96f8b2ff
commit 7ad8e6c849
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -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.