Remove networkScorer wrapper

Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily

Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590

src/com/android/settings/wifi/ConfigureWifiSettings.java

@@ -21,18 +21,15 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.provider.SearchIndexableResource;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.network.NetworkScorerPickerPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settings.wifi.p2p.WifiP2pPreferenceController;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
@@ -74,16 +71,12 @@ public class ConfigureWifiSettings extends DashboardFragment {
 
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        final NetworkScoreManagerWrapper networkScoreManagerWrapper =
-                new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
         mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);
         mUseOpenWifiPreferenceController = new UseOpenWifiPreferenceController(context, this,
-                networkScoreManagerWrapper, getLifecycle());
+                getLifecycle());
         final WifiManager wifiManager = (WifiManager) getSystemService(WIFI_SERVICE);
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(mWifiWakeupPreferenceController);
-        controllers.add(new NetworkScorerPickerPreferenceController(context,
-                networkScoreManagerWrapper));
         controllers.add(new NotifyOpenNetworksPreferenceController(context, getLifecycle()));
         controllers.add(mUseOpenWifiPreferenceController);
         controllers.add(new WifiInfoPreferenceController(context, getLifecycle(), wifiManager));
@@ -112,7 +105,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys =  super.getNonIndexableKeys(context);
+                    List<String> keys = super.getNonIndexableKeys(context);
 
                     // If connected to WiFi, this IP address will be the same as the Status IP.
                     // Or, if there is no connection they will say unavailable.

src/com/android/settings/wifi/UseOpenWifiPreferenceController.java

@@ -21,7 +21,6 @@ import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -38,11 +37,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
         LifecycleObserver, OnResume, OnPause {
     private static final String KEY_USE_OPEN_WIFI_AUTOMATICALLY = "use_open_wifi_automatically";
-    @VisibleForTesting static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
+    @VisibleForTesting
+    static final int REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY = 400;
 
     private final ContentResolver mContentResolver;
     private final Fragment mFragment;
-    private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper;
+    private final NetworkScoreManager mNetworkScoreManager;
     private final SettingObserver mSettingObserver;
 
     private Preference mPreference;
@@ -50,11 +50,12 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
     private boolean mDoFeatureSupportedScorersExist;
 
     public UseOpenWifiPreferenceController(Context context, Fragment fragment,
-            NetworkScoreManagerWrapper networkScoreManagerWrapper, Lifecycle lifecycle) {
+            Lifecycle lifecycle) {
         super(context);
         mContentResolver = context.getContentResolver();
         mFragment = fragment;
-        mNetworkScoreManagerWrapper = networkScoreManagerWrapper;
+        mNetworkScoreManager =
+                (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
         mSettingObserver = new SettingObserver();
         updateEnableUseWifiComponentName();
         checkForFeatureSupportedScorers();
@@ -62,7 +63,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
     }
 
     private void updateEnableUseWifiComponentName() {
-        NetworkScorerAppData appData = mNetworkScoreManagerWrapper.getActiveScorer();
+        NetworkScorerAppData appData = mNetworkScoreManager.getActiveScorer();
         mEnableUseWifiComponentName =
                 appData == null ? null : appData.getEnableUseOpenWifiActivity();
     }
@@ -72,7 +73,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
             mDoFeatureSupportedScorersExist = true;
             return;
         }
-        List<NetworkScorerAppData> scorers = mNetworkScoreManagerWrapper.getAllValidScorers();
+        List<NetworkScorerAppData> scorers = mNetworkScoreManager.getAllValidScorers();
         for (NetworkScorerAppData scorer : scorers) {
             if (scorer.getEnableUseOpenWifiActivity() != null) {
                 mDoFeatureSupportedScorersExist = true;
@@ -115,7 +116,7 @@ public class UseOpenWifiPreferenceController extends AbstractPreferenceControlle
         }
         final SwitchPreference useOpenWifiPreference = (SwitchPreference) preference;
 
-        boolean isScorerSet = mNetworkScoreManagerWrapper.getActiveScorerPackage() != null;
+        boolean isScorerSet = mNetworkScoreManager.getActiveScorerPackage() != null;
         boolean doesActiveScorerSupportFeature = mEnableUseWifiComponentName != null;
 
         useOpenWifiPreference.setChecked(isSettingEnabled());

src/com/android/settings/wifi/WifiWakeupPreferenceController.java

@@ -16,11 +16,7 @@
 
 package com.android.settings.wifi;
 
-import android.content.ContentResolver;
 import android.content.Context;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
 import android.provider.Settings;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
@@ -29,7 +25,6 @@ import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 /**