From cbb0b73aed6b8c052a6eb3ce0ebfe96667394c8b Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Mon, 26 Jul 2021 11:10:27 -0700
Subject: [PATCH] Remove NetworkScoreManager from WifiTrackerLib classes

NetworkScoreManager is being removed from WifiTrackerLib classes since
it was used for network scoring, which is being removed from the
Wifi picker UI. Remove the NetworkScoreManager argument from the
WifiTrackerLib constructors.

Bug: 194521441
Test: build
Change-Id: I60a1dcdc926f6494f1ef54b197e49992668f16ec
---
 src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java  | 3 ---
 src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java | 2 --
 .../savedaccesspoints2/SavedAccessPointsWifiSettings2.java     | 2 --
 3 files changed, 7 deletions(-)

diff --git a/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
index f8354094929..d91aba6ad5e 100644
--- a/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
+++ b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
@@ -18,7 +18,6 @@ package com.android.settings.wifi;
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 
@@ -47,7 +46,6 @@ public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
                 lifecycle, context,
                 context.getSystemService(WifiManager.class),
                 context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
                 mainHandler, workerHandler, clock,
                 maxScanAgeMillis, scanIntervalMillis,
                 listener);
@@ -66,7 +64,6 @@ public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
                 lifecycle, context,
                 context.getSystemService(WifiManager.class),
                 context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
                 mainHandler, workerHandler, clock,
                 maxScanAgeMillis, scanIntervalMillis,
                 key);
diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
index 61d2eb89b2d..7ede3a6678b 100644
--- a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
@@ -21,7 +21,6 @@ import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
@@ -149,7 +148,6 @@ public class WifiNetworkListFragment extends SettingsPreferenceFragment implemen
         mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
                 context.getSystemService(WifiManager.class),
                 context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
                 new Handler(Looper.getMainLooper()),
                 mWorkerThread.getThreadHandler(),
                 elapsedRealtimeClock,
diff --git a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index 1443e3247cf..799ba5e9fda 100644
--- a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -19,7 +19,6 @@ package com.android.settings.wifi.savedaccesspoints2;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
@@ -101,7 +100,6 @@ public class SavedAccessPointsWifiSettings2 extends DashboardFragment
         mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
                 context.getSystemService(WifiManager.class),
                 context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
                 new Handler(Looper.getMainLooper()),
                 mWorkerThread.getThreadHandler(),
                 elapsedRealtimeClock,