Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bd08fc2 authored by Vinit Deshpande's avatar Vinit Deshpande Committed by Android (Google) Code Review
Browse files

Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev

parents 16c1764c 5b7352cf

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.