Merge "Remove NetworkScoreManager from WifiTrackerLib classes"

This commit is contained in:
Quang Luong
2021-07-28 17:18:24 +00:00
committed by Android (Google) Code Review
3 changed files with 0 additions and 7 deletions

View File

@@ -18,7 +18,6 @@ package com.android.settings.wifi;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkScoreManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Handler; import android.os.Handler;
@@ -47,7 +46,6 @@ public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
lifecycle, context, lifecycle, context,
context.getSystemService(WifiManager.class), context.getSystemService(WifiManager.class),
context.getSystemService(ConnectivityManager.class), context.getSystemService(ConnectivityManager.class),
context.getSystemService(NetworkScoreManager.class),
mainHandler, workerHandler, clock, mainHandler, workerHandler, clock,
maxScanAgeMillis, scanIntervalMillis, maxScanAgeMillis, scanIntervalMillis,
listener); listener);
@@ -66,7 +64,6 @@ public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
lifecycle, context, lifecycle, context,
context.getSystemService(WifiManager.class), context.getSystemService(WifiManager.class),
context.getSystemService(ConnectivityManager.class), context.getSystemService(ConnectivityManager.class),
context.getSystemService(NetworkScoreManager.class),
mainHandler, workerHandler, clock, mainHandler, workerHandler, clock,
maxScanAgeMillis, scanIntervalMillis, maxScanAgeMillis, scanIntervalMillis,
key); key);

View File

@@ -21,7 +21,6 @@ import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkScoreManager;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
@@ -149,7 +148,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context, mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
context.getSystemService(WifiManager.class), context.getSystemService(WifiManager.class),
context.getSystemService(ConnectivityManager.class), context.getSystemService(ConnectivityManager.class),
context.getSystemService(NetworkScoreManager.class),
new Handler(Looper.getMainLooper()), new Handler(Looper.getMainLooper()),
mWorkerThread.getThreadHandler(), mWorkerThread.getThreadHandler(),
elapsedRealtimeClock, elapsedRealtimeClock,

View File

@@ -19,7 +19,6 @@ package com.android.settings.wifi.savedaccesspoints2;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkScoreManager;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@@ -101,7 +100,6 @@ public class SavedAccessPointsWifiSettings2 extends DashboardFragment
mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context, mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
context.getSystemService(WifiManager.class), context.getSystemService(WifiManager.class),
context.getSystemService(ConnectivityManager.class), context.getSystemService(ConnectivityManager.class),
context.getSystemService(NetworkScoreManager.class),
new Handler(Looper.getMainLooper()), new Handler(Looper.getMainLooper()),
mWorkerThread.getThreadHandler(), mWorkerThread.getThreadHandler(),
elapsedRealtimeClock, elapsedRealtimeClock,