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

Commit 8a3cb6d0 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes from topic "networkscoremanager-cachefilter" am: 427cb398 am: 17d1e1e1 

Change-Id: Ic12be3e4dbdd9a6c1bc8b8516e3f0a6e6cc29357
parents 9cfa347e 17d1e1e1

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

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback { 
    public void setListening(boolean listening) {

        if (listening) {

            mNetworkScoreManager.registerNetworkScoreCache(NetworkKey.TYPE_WIFI,

                    mWifiNetworkScoreCache, NetworkScoreManager.CACHE_FILTER_CURRENT_NETWORK);

                    mWifiNetworkScoreCache, NetworkScoreManager.SCORE_FILTER_CURRENT_NETWORK);

            mWifiNetworkScoreCache.registerListener(mCacheListener);

            mConnectivityManager.registerNetworkCallback(

                    mNetworkRequest, mNetworkCallback, mHandler);

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

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
        mNetworkScoreManager.registerNetworkScoreCache(

                NetworkKey.TYPE_WIFI,

                mScoreCache,

                NetworkScoreManager.CACHE_FILTER_SCAN_RESULTS);

                NetworkScoreManager.SCORE_FILTER_SCAN_RESULTS);

    }



    private void requestScoresForNetworkKeys(Collection<NetworkKey> keys) {