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

Commit 5b7352cf authored by Vinit Deshpande's avatar Vinit Deshpande
Browse files

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
parent 1cb0de17

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

+5 −1
Original line number Diff line number Diff line
@@ -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.