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

Commit fd8178d5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Introduce a flag to signify the presence of saved profile in scan results"

parents 5ea4f94f ecbb53e9

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

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ public class AccessPoint implements Comparable<AccessPoint> { 


    private Object mTag;



    public boolean foundInScanResult = false;



    public AccessPoint(Context context, Bundle savedState) {

        mContext = context;

        mConfig = savedState.getParcelable(KEY_CONFIG);

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

+3 −1
Original line number Diff line number Diff line
@@ -319,7 +319,8 @@ public class WifiTracker { 
                if (config.selfAdded && config.numAssociation == 0) {

                    continue;

                }

                AccessPoint accessPoint = new AccessPoint(mContext, config);

                AccessPoint accessPoint = getCachedOrCreate(config, cachedAccessPoints);

                accessPoint.foundInScanResult = false;

                if (mLastInfo != null && mLastNetworkInfo != null) {

                    if (config.isPasspoint() == false) {

                        accessPoint.update(connectionConfig, mLastInfo, mLastNetworkInfo);
@@ -352,6 +353,7 @@ public class WifiTracker { 
                boolean found = false;

                for (AccessPoint accessPoint : apMap.getAll(result.SSID)) {

                    if (accessPoint.update(result)) {

                        accessPoint.foundInScanResult = true;

                        found = true;

                        break;

                    }