Remove networkScorer wrapper

Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily

Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590

src/com/android/settings/network/NetworkScorerPicker.java

@@ -26,11 +26,11 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedPreferenceFragment;
 import com.android.settings.widget.RadioButtonPreference;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
 
 import java.util.List;
 
@@ -40,7 +40,7 @@ import java.util.List;
 public class NetworkScorerPicker extends InstrumentedPreferenceFragment implements
         RadioButtonPreference.OnClickListener {
 
-    private NetworkScoreManagerWrapper mNetworkScoreManager;
+    private NetworkScoreManager mNetworkScoreManager;
 
     @Override
     public int getMetricsCategory() {
@@ -56,12 +56,12 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        mNetworkScoreManager = createNetworkScorerManagerWrapper(context);
+        mNetworkScoreManager = createNetworkScorerManager(context);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+            Bundle savedInstanceState) {
         final View view = super.onCreateView(inflater, container, savedInstanceState);
         // this is needed so the back button goes back to previous fragment
         setHasOptionsMenu(true);
@@ -138,7 +138,7 @@ public class NetworkScorerPicker extends InstrumentedPreferenceFragment implemen
     }
 
     @VisibleForTesting
-    NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) {
-        return new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
+    NetworkScoreManager createNetworkScorerManager(Context context) {
+        return (NetworkScoreManager) context.getSystemService(Context.NETWORK_SCORE_SERVICE);
     }
 }

src/com/android/settings/network/NetworkScorerPickerPreferenceController.java

@@ -16,12 +16,12 @@
 package com.android.settings.network;
 
 import android.content.Context;
+import android.net.NetworkScoreManager;
 import android.net.NetworkScorerAppData;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.wrapper.NetworkScoreManagerWrapper;
+import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.List;
@@ -30,22 +30,19 @@ import java.util.List;
  * {@link AbstractPreferenceController} that shows the active network scorer and toggles the
  * preference based on whether or not there are valid scorers installed.
  */
-public class NetworkScorerPickerPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin {
+public class NetworkScorerPickerPreferenceController extends BasePreferenceController {
 
-    private static final String KEY_NETWORK_SCORER_PICKER = "network_scorer_picker";
+    private final NetworkScoreManager mNetworkScoreManager;
 
-    private final NetworkScoreManagerWrapper mNetworkScoreManager;
-
-    public NetworkScorerPickerPreferenceController(Context context,
-            NetworkScoreManagerWrapper networkScoreManager) {
-        super(context);
-        mNetworkScoreManager = networkScoreManager;
+    public NetworkScorerPickerPreferenceController(Context context, String key) {
+        super(context, key);
+        mNetworkScoreManager =
+                (NetworkScoreManager) mContext.getSystemService(Context.NETWORK_SCORE_SERVICE);
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_NETWORK_SCORER_PICKER;
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
     }
 
     @Override
@@ -67,9 +64,4 @@ public class NetworkScorerPickerPreferenceController extends AbstractPreferenceC
             preference.setSummary(scorer.getRecommendationServiceLabel());
         }
     }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
 }