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

Commit 64d02323 authored by Eric Schwarzenbach's avatar Eric Schwarzenbach Committed by Android (Google) Code Review
Browse files

Merge "Use NetworkKey factory methods instead of constructor."

parents 02916dc2 733ea267

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

+2 −4
Original line number Diff line number Diff line
@@ -454,8 +454,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 


        // set mSpeed to the connected ScanResult if the AccessPoint is the active network

        if (isActive() && mInfo != null) {

            NetworkKey key = new NetworkKey(new WifiKey(

                    AccessPoint.convertToQuotedString(ssid), mInfo.getBSSID()));

            NetworkKey key = NetworkKey.createFromWifiInfo(mInfo);

            ScoredNetwork score = scoreCache.getScoredNetwork(key);

            if (score != null) {

                mSpeed = score.calculateBadge(mInfo.getRssi());
@@ -478,8 +477,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
        mIsScoredNetworkMetered = false;



        if (isActive() && mInfo != null) {

            NetworkKey key = new NetworkKey(new WifiKey(

                    AccessPoint.convertToQuotedString(ssid), mInfo.getBSSID()));

            NetworkKey key = NetworkKey.createFromWifiInfo(mInfo);

            ScoredNetwork score = scoreCache.getScoredNetwork(key);

            if (score != null) {

                mIsScoredNetworkMetered |= score.meteredHint;