am 3f96f8b2: am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev (7ad8e6c8) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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.