Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "networkscoremanager-cachefilter"

Browse Source 
am: 427cb398e2

Change-Id: Id41d1203399adef1bae7cc3ee114090fa63ca396
This commit is contained in:
David Su
2020-01-15 10:18:16 -08:00
committed by android-build-merger
parent 51564c0050 427cb398e2
commit 17d1e1e11a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -90,7 +90,7 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening) {
mNetworkScoreManager.registerNetworkScoreCache(NetworkKey.TYPE_WIFI, mNetworkScoreManager.registerNetworkScoreCache(NetworkKey.TYPE_WIFI,
mWifiNetworkScoreCache, NetworkScoreManager.CACHE_FILTER_CURRENT_NETWORK); mWifiNetworkScoreCache, NetworkScoreManager.SCORE_FILTER_CURRENT_NETWORK);
mWifiNetworkScoreCache.registerListener(mCacheListener); mWifiNetworkScoreCache.registerListener(mCacheListener);
mConnectivityManager.registerNetworkCallback( mConnectivityManager.registerNetworkCallback(
mNetworkRequest, mNetworkCallback, mHandler); mNetworkRequest, mNetworkCallback, mHandler);

2
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -359,7 +359,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
mNetworkScoreManager.registerNetworkScoreCache( mNetworkScoreManager.registerNetworkScoreCache(
NetworkKey.TYPE_WIFI, NetworkKey.TYPE_WIFI,
mScoreCache, mScoreCache,
NetworkScoreManager.CACHE_FILTER_SCAN_RESULTS); NetworkScoreManager.SCORE_FILTER_SCAN_RESULTS);
} }
private void requestScoresForNetworkKeys(Collection<NetworkKey> keys) { private void requestScoresForNetworkKeys(Collection<NetworkKey> keys) {