diff --git a/res/xml/wifi_configure_settings.xml b/res/xml/wifi_configure_settings.xml index eae6faa059a..8ec320a053c 100644 --- a/res/xml/wifi_configure_settings.xml +++ b/res/xml/wifi_configure_settings.xml @@ -15,16 +15,16 @@ --> + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:settings="http://schemas.android.com/apk/res-auto" + android:key="wifi_configure_settings_screen" + android:title="@string/wifi_configure_settings_preference_title"> + android:key="enable_wifi_wakeup" + android:title="@string/wifi_wakeup" + android:icon="@drawable/ic_auto_wifi" + android:summary="@string/wifi_wakeup_summary" /> + android:key="notify_open_networks" + android:title="@string/wifi_notify_open_networks" + android:icon="@drawable/ic_open_wifi_notifications" + android:summary="@string/wifi_notify_open_networks_summary" /> + android:summary="@string/wifi_cellular_data_fallback_summary" /> + android:key="install_credentials" + android:title="@string/wifi_install_credentials"> - + + android:key="network_scorer_picker" + android:title="@string/network_scorer_picker_title" + android:fragment="com.android.settings.network.NetworkScorerPicker" + settings:controller="com.android.settings.network.NetworkScorerPickerPreferenceController" /> + android:key="wifi_direct" + android:title="@string/wifi_menu_p2p" + android:fragment="com.android.settings.wifi.p2p.WifiP2pSettings" /> + android:key="mac_address" + android:title="@string/wifi_advanced_mac_address_title" /> + android:key="current_ip_address" + android:title="@string/wifi_advanced_ip_address_title" /> diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java index 34accf24671..a7e4014ca1a 100644 --- a/src/com/android/settings/network/NetworkScorerPicker.java +++ b/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); } } diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java index e25e62d79ec..c573106db09 100644 --- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java +++ b/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; - } } diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index b7e01c86e3d..0938f67acc7 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/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 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 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 getNonIndexableKeys(Context context) { - List keys = super.getNonIndexableKeys(context); + List 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. diff --git a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java b/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java index c563fce4261..350f9d1b440 100644 --- a/src/com/android/settings/wifi/UseOpenWifiPreferenceController.java +++ b/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 scorers = mNetworkScoreManagerWrapper.getAllValidScorers(); + List 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()); diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index bc9f2a04d2a..5a9f6aea2ce 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/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; /** diff --git a/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java b/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java deleted file mode 100644 index a07d6457a09..00000000000 --- a/src/com/android/settings/wrapper/NetworkScoreManagerWrapper.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.settings.wrapper; - -import android.annotation.Nullable; -import android.net.NetworkScoreManager; -import android.net.NetworkScorerAppData; - -import java.util.List; - -/** - * Wrapper around {@link NetworkScoreManager} to facilitate unit testing. - * - * TODO: delete this class once robolectric supports Android O - */ -public class NetworkScoreManagerWrapper { - private final NetworkScoreManager mNetworkScoreManager; - - public NetworkScoreManagerWrapper(NetworkScoreManager networkScoreManager) { - mNetworkScoreManager = networkScoreManager; - } - - /** - * Returns the list of available scorer apps. The list will be empty if there are - * no valid scorers. - */ - public List getAllValidScorers() { - return mNetworkScoreManager.getAllValidScorers(); - } - - /** - * Obtain the package name of the current active network scorer. - * - *

At any time, only one scorer application will receive {@link #ACTION_SCORE_NETWORKS} - * broadcasts and be allowed to call {@link #updateScores}. Applications may use this method to - * determine the current scorer and offer the user the ability to select a different scorer via - * the {@link #ACTION_CHANGE_ACTIVE} intent. - * @return the full package name of the current active scorer, or null if there is no active - * scorer. - */ - @Nullable - public String getActiveScorerPackage() { - return mNetworkScoreManager.getActiveScorerPackage(); - } - - /** - * Returns metadata about the active scorer or null if there is no active scorer. - */ - @Nullable - public NetworkScorerAppData getActiveScorer() { - return mNetworkScoreManager.getActiveScorer(); - } - - /** - * Set the active scorer to a new package and clear existing scores. - * - *

Should never be called directly without obtaining user consent. This can be done by using - * the {@link #ACTION_CHANGE_ACTIVE} broadcast, or using a custom configuration activity. - * - * @return true if the operation succeeded, or false if the new package is not a valid scorer. - * @throws SecurityException if the caller is not a system process or does not hold the - * {@link android.Manifest.permission#REQUEST_NETWORK_SCORES} permission - */ - public boolean setActiveScorer(String packageName) throws SecurityException { - return mNetworkScoreManager.setActiveScorer(packageName); - } -} \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java index 91d08e6d783..83ec5f8b7d4 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java @@ -23,12 +23,12 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; 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.testutils.SettingsRobolectricTestRunner; -import com.android.settings.wrapper.NetworkScoreManagerWrapper; import org.junit.Before; import org.junit.Test; @@ -36,6 +36,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.util.ReflectionHelpers; import java.util.Collections; @@ -48,14 +49,15 @@ public class NetworkScorerPickerPreferenceControllerTest { private Context mContext; @Mock - private NetworkScoreManagerWrapper mNetworkScorer; + private NetworkScoreManager mNetworkScorer; private NetworkScorerPickerPreferenceController mController; @Before public void setUp() { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; - mController = new NetworkScorerPickerPreferenceController(mContext, mNetworkScorer); + mController = new NetworkScorerPickerPreferenceController(mContext, "test_key"); + ReflectionHelpers.setField(mController, "mNetworkScoreManager", mNetworkScorer); } @Test diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java index d96f146e641..58a2c6a1172 100644 --- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java +++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.when; import android.content.ComponentName; import android.content.Context; +import android.net.NetworkScoreManager; import android.net.NetworkScorerAppData; import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceScreen; @@ -33,7 +34,7 @@ import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.widget.RadioButtonPreference; -import com.android.settings.wrapper.NetworkScoreManagerWrapper; + import com.google.android.collect.Lists; import org.junit.Before; @@ -56,7 +57,7 @@ public class NetworkScorerPickerTest { private Context mContext; @Mock - private NetworkScoreManagerWrapper mNetworkScoreManager; + private NetworkScoreManager mNetworkScoreManager; @Mock private PreferenceScreen mPreferenceScreen; @@ -111,7 +112,7 @@ public class NetworkScorerPickerTest { verify(mPreferenceScreen).addPreference(arg.capture()); assertThat(arg.getValue().getTitle()) - .isEqualTo(mContext.getString(R.string.network_scorer_picker_none_preference)); + .isEqualTo(mContext.getString(R.string.network_scorer_picker_none_preference)); assertThat(arg.getValue().isChecked()).isTrue(); } @@ -169,13 +170,13 @@ public class NetworkScorerPickerTest { private final Context mContext; private final PreferenceScreen mScreen; private final PreferenceManager mPrefManager; - private final NetworkScoreManagerWrapper mNetworkScoreManagerWrapper; + private final NetworkScoreManager mNetworkScoreManager; public TestFragment(Context context, PreferenceScreen preferenceScreen, - NetworkScoreManagerWrapper networkScoreManagerWrapper) { + NetworkScoreManager networkScoreManager) { mContext = context; mScreen = preferenceScreen; - mNetworkScoreManagerWrapper = networkScoreManagerWrapper; + mNetworkScoreManager = networkScoreManager; mPrefManager = mock(PreferenceManager.class); when(mPrefManager.getContext()).thenReturn(context); } @@ -196,8 +197,8 @@ public class NetworkScorerPickerTest { } @Override - NetworkScoreManagerWrapper createNetworkScorerManagerWrapper(Context context) { - return mNetworkScoreManagerWrapper; + NetworkScoreManager createNetworkScorerManager(Context context) { + return mNetworkScoreManager; } } } diff --git a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java index 46a7cb2004f..8802e323980 100644 --- a/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/UseOpenWifiPreferenceControllerTest.java @@ -16,8 +16,10 @@ package com.android.settings.wifi; +import static android.content.Context.NETWORK_SCORE_SERVICE; import static android.provider.Settings.Global.USE_OPEN_WIFI_PACKAGE; -import static com.android.settings.wifi.UseOpenWifiPreferenceController.REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; +import static com.android.settings.wifi.UseOpenWifiPreferenceController + .REQUEST_CODE_OPEN_WIFI_AUTOMATICALLY; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; @@ -38,8 +40,8 @@ import android.support.v7.preference.Preference; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.wrapper.NetworkScoreManagerWrapper; import com.android.settingslib.core.lifecycle.Lifecycle; + import com.google.common.collect.Lists; import org.junit.Before; @@ -51,6 +53,7 @@ import org.mockito.Captor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; +import org.robolectric.shadows.ShadowApplication; import java.util.ArrayList; import java.util.List; @@ -74,7 +77,7 @@ public class UseOpenWifiPreferenceControllerTest { @Mock private Fragment mFragment; @Mock - private NetworkScoreManagerWrapper mNetworkScoreManagerWrapper; + private NetworkScoreManager mNetworkScoreManager; @Captor private ArgumentCaptor mIntentCaptor; private Context mContext; @@ -85,23 +88,25 @@ public class UseOpenWifiPreferenceControllerTest { MockitoAnnotations.initMocks(this); mContext = RuntimeEnvironment.application; + ShadowApplication.getInstance() + .setSystemService(NETWORK_SCORE_SERVICE, mNetworkScoreManager); } private void createController() { - mController = new UseOpenWifiPreferenceController( - mContext, mFragment, mNetworkScoreManagerWrapper, mLifecycle); + mController = new UseOpenWifiPreferenceController(mContext, mFragment, mLifecycle); } /** * Sets the scorers. + * * @param scorers list of scorers returned by {@link NetworkScoreManager#getAllValidScorers()}. * First scorer in the list is the active scorer. */ private void setupScorers(@NonNull List scorers) { - when(mNetworkScoreManagerWrapper.getActiveScorerPackage()) - .thenReturn(sEnableActivityComponent.getPackageName()); - when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(scorers); - when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(scorers.get(0)); + when(mNetworkScoreManager.getActiveScorerPackage()) + .thenReturn(sEnableActivityComponent.getPackageName()); + when(mNetworkScoreManager.getAllValidScorers()).thenReturn(scorers); + when(mNetworkScoreManager.getActiveScorer()).thenReturn(scorers.get(0)); } @Test @@ -130,7 +135,7 @@ public class UseOpenWifiPreferenceControllerTest { @Test public void testIsAvailable_returnsTrueIfNonActiveScorerSupported() { setupScorers(Lists.newArrayList(sAppDataNoActivity, sAppData)); - when(mNetworkScoreManagerWrapper.getActiveScorer()).thenReturn(sAppDataNoActivity); + when(mNetworkScoreManager.getActiveScorer()).thenReturn(sAppDataNoActivity); createController(); assertThat(mController.isAvailable()).isTrue(); @@ -192,7 +197,7 @@ public class UseOpenWifiPreferenceControllerTest { setupScorers(Lists.newArrayList(sAppData, sAppDataNoActivity)); createController(); - assertThat(mController.onActivityResult(234 /* requestCode */ , Activity.RESULT_OK)) + assertThat(mController.onActivityResult(234 /* requestCode */, Activity.RESULT_OK)) .isEqualTo(false); assertThat(Settings.Global.getString(mContext.getContentResolver(), USE_OPEN_WIFI_PACKAGE)) .isNull(); @@ -240,7 +245,7 @@ public class UseOpenWifiPreferenceControllerTest { @Test public void updateState_noScorer_preferenceDisabled_summaryChanged() { - when(mNetworkScoreManagerWrapper.getAllValidScorers()).thenReturn(new ArrayList<>()); + when(mNetworkScoreManager.getAllValidScorers()).thenReturn(new ArrayList<>()); createController(); final SwitchPreference preference = mock(SwitchPreference.class);