diff options
13 files changed, 66 insertions, 67 deletions
diff --git a/src/com/android/settings/location/LocationScanningPreferenceController.java b/src/com/android/settings/location/LocationScanningPreferenceController.java index 436676df55..a0c3241211 100644 --- a/src/com/android/settings/location/LocationScanningPreferenceController.java +++ b/src/com/android/settings/location/LocationScanningPreferenceController.java @@ -17,6 +17,7 @@ package com.android.settings.location; import android.content.Context; +import android.net.wifi.WifiManager; import android.provider.Settings; import com.android.settings.R; @@ -25,14 +26,16 @@ import com.android.settings.core.BasePreferenceController; public class LocationScanningPreferenceController extends BasePreferenceController { + private final WifiManager mWifiManager; + public LocationScanningPreferenceController(Context context, String key) { super(context, key); + mWifiManager = context.getSystemService(WifiManager.class); } @Override public CharSequence getSummary() { - final boolean wifiScanOn = Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1; + final boolean wifiScanOn = mWifiManager.isScanAlwaysAvailable(); final boolean bleScanOn = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0) == 1; int resId; diff --git a/src/com/android/settings/location/WifiScanningPreferenceController.java b/src/com/android/settings/location/WifiScanningPreferenceController.java index 234ec5e53e..2e393a2638 100644 --- a/src/com/android/settings/location/WifiScanningPreferenceController.java +++ b/src/com/android/settings/location/WifiScanningPreferenceController.java @@ -14,7 +14,7 @@ package com.android.settings.location; import android.content.Context; -import android.provider.Settings; +import android.net.wifi.WifiManager; import androidx.preference.Preference; import androidx.preference.SwitchPreference; @@ -26,9 +26,11 @@ public class WifiScanningPreferenceController extends AbstractPreferenceControll implements PreferenceControllerMixin { private static final String KEY_WIFI_SCAN_ALWAYS_AVAILABLE = "wifi_always_scanning"; + private final WifiManager mWifiManager; public WifiScanningPreferenceController(Context context) { super(context); + mWifiManager = context.getSystemService(WifiManager.class); } @Override @@ -43,17 +45,13 @@ public class WifiScanningPreferenceController extends AbstractPreferenceControll @Override public void updateState(Preference preference) { - ((SwitchPreference) preference).setChecked( - Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1); + ((SwitchPreference) preference).setChecked(mWifiManager.isScanAlwaysAvailable()); } @Override public boolean handlePreferenceTreeClick(Preference preference) { if (KEY_WIFI_SCAN_ALWAYS_AVAILABLE.equals(preference.getKey())) { - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, - ((SwitchPreference) preference).isChecked() ? 1 : 0); + mWifiManager.setScanAlwaysAvailable(((SwitchPreference) preference).isChecked()); return true; } return false; diff --git a/src/com/android/settings/wifi/WifiScanModeActivity.java b/src/com/android/settings/wifi/WifiScanModeActivity.java index 4dc1b97a00..024dc10412 100644 --- a/src/com/android/settings/wifi/WifiScanModeActivity.java +++ b/src/com/android/settings/wifi/WifiScanModeActivity.java @@ -24,7 +24,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiManager; import android.os.Bundle; -import android.provider.Settings; import android.text.TextUtils; import androidx.appcompat.app.AlertDialog; @@ -80,8 +79,7 @@ public class WifiScanModeActivity extends FragmentActivity { } private void doPositiveClick() { - Settings.Global.putInt(getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + getApplicationContext().getSystemService(WifiManager.class).setScanAlwaysAvailable(true); setResult(RESULT_OK); finish(); } diff --git a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java index fa9b21a518..0f81edba02 100644 --- a/src/com/android/settings/wifi/WifiScanningRequiredFragment.java +++ b/src/com/android/settings/wifi/WifiScanningRequiredFragment.java @@ -23,8 +23,8 @@ import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.net.wifi.WifiManager; import android.os.Bundle; -import android.provider.Settings; import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -69,8 +69,7 @@ public class WifiScanningRequiredFragment extends InstrumentedDialogFragment imp ContentResolver contentResolver = context.getContentResolver(); switch(which) { case DialogInterface.BUTTON_POSITIVE: - Settings.Global.putInt(contentResolver, - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + context.getSystemService(WifiManager.class).setScanAlwaysAvailable(true); Toast.makeText( context, context.getString(R.string.wifi_settings_scanning_required_enabled), diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java index f563e32669..bba90016bb 100644 --- a/src/com/android/settings/wifi/WifiSettings.java +++ b/src/com/android/settings/wifi/WifiSettings.java @@ -1048,8 +1048,7 @@ public class WifiSettings extends RestrictedSettingsFragment final PowerManager powerManager = context.getSystemService(PowerManager.class); final ContentResolver contentResolver = context.getContentResolver(); return mWifiManager.isAutoWakeupEnabled() - && Settings.Global.getInt(contentResolver, - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1 + && mWifiManager.isScanAlwaysAvailable() && Settings.Global.getInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) == 0 && !powerManager.isPowerSaveMode(); @@ -1060,8 +1059,8 @@ public class WifiSettings extends RestrictedSettingsFragment // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead, // read the system settings directly. Because when the device is in Airplane mode, even if // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off". - final boolean wifiScanningMode = Settings.Global.getInt(getActivity().getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1; + // TODO(b/149421497): Fix this? + final boolean wifiScanningMode = mWifiManager.isScanAlwaysAvailable(); final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text) : getText(R.string.wifi_scan_notify_text_scanning_off); final LinkifyUtils.OnClickListener clickListener = diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java index 86effea929..1b3a7313fc 100644 --- a/src/com/android/settings/wifi/WifiSettings2.java +++ b/src/com/android/settings/wifi/WifiSettings2.java @@ -852,8 +852,7 @@ public class WifiSettings2 extends RestrictedSettingsFragment final PowerManager powerManager = context.getSystemService(PowerManager.class); final ContentResolver contentResolver = context.getContentResolver(); return mWifiManager.isAutoWakeupEnabled() - && Settings.Global.getInt(contentResolver, - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1 + && mWifiManager.isScanAlwaysAvailable() && Settings.Global.getInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0) == 0 && !powerManager.isPowerSaveMode(); @@ -864,8 +863,8 @@ public class WifiSettings2 extends RestrictedSettingsFragment // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead, // read the system settings directly. Because when the device is in Airplane mode, even if // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off". - final boolean wifiScanningMode = Settings.Global.getInt(getActivity().getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1; + // TODO(b/149421497): Fix this? + final boolean wifiScanningMode = mWifiManager.isScanAlwaysAvailable(); final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text) : getText(R.string.wifi_scan_notify_text_scanning_off); final LinkifyUtils.OnClickListener clickListener = diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java index d2a4a98c0f..e9fd35004d 100644 --- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java +++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java @@ -153,8 +153,7 @@ public class WifiWakeupPreferenceController extends TogglePreferenceController i } private boolean getWifiScanningEnabled() { - return Settings.Global.getInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1; + return mWifiManager.isScanAlwaysAvailable(); } private void showScanningDialog() { diff --git a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java index 28403b1fb1..149276658b 100644 --- a/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/LocationScanningPreferenceControllerTest.java @@ -18,7 +18,11 @@ package com.android.settings.location; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; + import android.content.Context; +import android.net.wifi.WifiManager; import android.provider.Settings; import com.android.settings.R; @@ -26,18 +30,24 @@ import com.android.settings.R; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) public class LocationScanningPreferenceControllerTest { + @Mock + private WifiManager mWifiManager; private Context mContext; private LocationScanningPreferenceController mController; @Before public void setUp() { - mContext = RuntimeEnvironment.application; + MockitoAnnotations.initMocks(this); + mContext = spy(RuntimeEnvironment.application); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mController = new LocationScanningPreferenceController(mContext, "key"); } @@ -48,8 +58,7 @@ public class LocationScanningPreferenceControllerTest { @Test public void testLocationScanning_WifiOnBleOn() { - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1); assertThat(mController.getSummary()).isEqualTo( @@ -58,8 +67,7 @@ public class LocationScanningPreferenceControllerTest { @Test public void testLocationScanning_WifiOnBleOff() { - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0); assertThat(mController.getSummary()).isEqualTo( @@ -68,8 +76,7 @@ public class LocationScanningPreferenceControllerTest { @Test public void testLocationScanning_WifiOffBleOn() { - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 1); assertThat(mController.getSummary()).isEqualTo( @@ -78,8 +85,7 @@ public class LocationScanningPreferenceControllerTest { @Test public void testLocationScanning_WifiOffBleOff() { - Settings.Global.putInt(mContext.getContentResolver(), - Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE, 0); assertThat(mController.getSummary()).isEqualTo( diff --git a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java index 53acda314b..1cfb70c374 100644 --- a/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/WifiScanningPreferenceControllerTest.java @@ -15,14 +15,13 @@ */ package com.android.settings.location; -import static com.google.common.truth.Truth.assertThat; - +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.ContentResolver; -import android.provider.Settings; -import android.provider.Settings.Global; +import android.content.Context; +import android.net.wifi.WifiManager; import androidx.preference.SwitchPreference; @@ -39,7 +38,10 @@ public class WifiScanningPreferenceControllerTest { @Mock private SwitchPreference mPreference; + @Mock + private WifiManager mWifiManager; + private Context mContext; private ContentResolver mContentResolver; private WifiScanningPreferenceController mController; @@ -47,13 +49,16 @@ public class WifiScanningPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); mContentResolver = RuntimeEnvironment.application.getContentResolver(); - mController = new WifiScanningPreferenceController(RuntimeEnvironment.application); + mContext = spy(RuntimeEnvironment.application); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); + + mController = new WifiScanningPreferenceController(mContext); when(mPreference.getKey()).thenReturn(mController.getPreferenceKey()); } @Test public void updateState_wifiScanningEnabled_shouldCheckedPreference() { - Settings.Global.putInt(mContentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); mController.updateState(mPreference); @@ -62,7 +67,7 @@ public class WifiScanningPreferenceControllerTest { @Test public void updateState_wifiScanningDisabled_shouldUncheckedPreference() { - Settings.Global.putInt(mContentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); mController.updateState(mPreference); @@ -75,9 +80,7 @@ public class WifiScanningPreferenceControllerTest { mController.handlePreferenceTreeClick(mPreference); - final int scanAlways = - Settings.Global.getInt(mContentResolver, Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); - assertThat(scanAlways).isEqualTo(1); + verify(mWifiManager).setScanAlwaysAvailable(true); } @Test @@ -86,8 +89,6 @@ public class WifiScanningPreferenceControllerTest { mController.handlePreferenceTreeClick(mPreference); - final int scanAlways = - Settings.Global.getInt(mContentResolver, Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); - assertThat(scanAlways).isEqualTo(0); + verify(mWifiManager).setScanAlwaysAvailable(false); } } diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index 9291e0bb3f..e5c730f728 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -15,8 +15,6 @@ */ package com.android.settings.wifi; -import static com.google.common.truth.Truth.assertThat; - import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.isNull; @@ -27,10 +25,12 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; import android.content.DialogInterface; +import android.net.wifi.WifiManager; import android.provider.Settings; import androidx.appcompat.app.AlertDialog; @@ -53,6 +53,8 @@ public class WifiScanningRequiredFragmentTest { private Context mContext; private ContentResolver mResolver; @Mock + private WifiManager mWifiManager; + @Mock private Fragment mCallbackFragment; @Mock private AlertDialog.Builder mBuilder; @@ -61,12 +63,13 @@ public class WifiScanningRequiredFragmentTest { public void setUp() { MockitoAnnotations.initMocks(this); mFragment = spy(WifiScanningRequiredFragment.newInstance()); - mContext = RuntimeEnvironment.application; + mContext = spy(RuntimeEnvironment.application); + when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager); mResolver = mContext.getContentResolver(); doReturn(mContext).when(mFragment).getContext(); mFragment.setTargetFragment(mCallbackFragment, 1000); - Settings.Global.putInt(mResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); } @Test @@ -74,8 +77,7 @@ public class WifiScanningRequiredFragmentTest { throws Settings.SettingNotFoundException { mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE); - assertThat(Settings.Global.getInt(mResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE)) - .isEqualTo(1); + verify(mWifiManager).setScanAlwaysAvailable(false); } @Test diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java index e5b5eb10a0..2af87fe63d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java @@ -163,7 +163,7 @@ public class WifiSettings2Test { public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() { final ContentResolver contentResolver = mContext.getContentResolver(); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(contentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0); when(mPowerManager.isPowerSaveMode()).thenReturn(false); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java index 3dd0da9f18..eae75d601d 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java @@ -248,7 +248,7 @@ public class WifiSettingsTest { public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() { final ContentResolver contentResolver = mContext.getContentResolver(); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(contentResolver, Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0); when(mPowerManager.isPowerSaveMode()).thenReturn(false); diff --git a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java index a41d7c85d3..8face4a757 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiWakeupPreferenceControllerTest.java @@ -16,22 +16,17 @@ package com.android.settings.wifi; -import static android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE; - import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import android.content.Context; import android.location.LocationManager; import android.net.wifi.WifiManager; -import android.provider.Settings; - import android.text.TextUtils; -import androidx.preference.Preference; + import androidx.preference.SwitchPreference; import com.android.settings.R; @@ -69,14 +64,14 @@ public class WifiWakeupPreferenceControllerTest { mController.mPreference = mPreference; mController.mWifiManager = mWifiManager; - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); doReturn(true).when(mLocationManager).isLocationEnabled(); } @Test public void setChecked_scanEnableLocationEnable_wifiWakeupEnable() { when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false); - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); doReturn(true).when(mLocationManager).isLocationEnabled(); mController.setChecked(true); @@ -88,7 +83,7 @@ public class WifiWakeupPreferenceControllerTest { public void updateState_wifiWakeupEnableScanningDisable_wifiWakeupDisabled() { final SwitchPreference preference = new SwitchPreference(mContext); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); doReturn(true).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); @@ -102,7 +97,7 @@ public class WifiWakeupPreferenceControllerTest { public void updateState_preferenceSetCheckedWhenWakeupSettingEnabled() { final SwitchPreference preference = new SwitchPreference(mContext); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 1); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true); doReturn(true).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); @@ -128,7 +123,7 @@ public class WifiWakeupPreferenceControllerTest { public void updateState_preferenceSetUncheckedWhenWifiScanningDisabled() { final SwitchPreference preference = new SwitchPreference(mContext); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); mController.updateState(preference); @@ -165,7 +160,7 @@ public class WifiWakeupPreferenceControllerTest { public void updateState_preferenceSetUncheckedWhenWifiScanningDisabledLocationEnabled() { final SwitchPreference preference = new SwitchPreference(mContext); when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true); - Settings.Global.putInt(mContext.getContentResolver(), WIFI_SCAN_ALWAYS_AVAILABLE, 0); + when(mWifiManager.isScanAlwaysAvailable()).thenReturn(false); doReturn(false).when(mLocationManager).isLocationEnabled(); mController.updateState(preference); |