PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use new API for scan throttle toggle

Browse Source 
Bug: 148514485
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.development
Test: Verified wifi scan throttle toggle in Developer options
Change-Id: Ib42e3650abfb514e95ef8583131cd575c0ac049f
This commit is contained in:
Roshan Pius
2020-02-05 14:28:12 -08:00
parent 1b2670fae4
commit 84019df2e8
2 changed files with 17 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/com/android/settings/development/WifiScanThrottlingPreferenceController.java
View File

@@ -17,9 +17,8 @@
package com.android.settings.development;
import android.content.Context;
import android.provider.Settings;
import android.net.wifi.WifiManager;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import androidx.preference.SwitchPreference;
@@ -29,13 +28,12 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController;
public class WifiScanThrottlingPreferenceController extends DeveloperOptionsPreferenceController
implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {
private static final String WIFI_SCAN_THROTTLING_KEY = "wifi_scan_throttling";
@VisibleForTesting
static final int SETTING_THROTTLING_ENABLE_VALUE_ON = 1; // default is throttling enabled.
@VisibleForTesting
static final int SETTING_THROTTLING_ENABLE_VALUE_OFF = 0;
private final WifiManager mWifiManager;
public WifiScanThrottlingPreferenceController(Context context) {
super(context);
mWifiManager = context.getSystemService(WifiManager.class);
}
@Override
@@ -46,28 +44,19 @@ public class WifiScanThrottlingPreferenceController extends DeveloperOptionsPref
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue;
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED,
isEnabled
? SETTING_THROTTLING_ENABLE_VALUE_ON
: SETTING_THROTTLING_ENABLE_VALUE_OFF);
mWifiManager.setScanThrottleEnabled(isEnabled);
return true;
}
@Override
public void updateState(Preference preference) {
final int scanThrottleEnabled = Settings.Global.getInt(
mContext.getContentResolver(), Settings.Global.WIFI_SCAN_THROTTLE_ENABLED,
SETTING_THROTTLING_ENABLE_VALUE_ON);
((SwitchPreference) mPreference).setChecked(
scanThrottleEnabled == SETTING_THROTTLING_ENABLE_VALUE_ON);
((SwitchPreference) mPreference).setChecked(mWifiManager.isScanThrottleEnabled());
}
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED, SETTING_THROTTLING_ENABLE_VALUE_ON);
mWifiManager.setScanThrottleEnabled(true);
((SwitchPreference) mPreference).setChecked(true);
}
}

37
tests/robotests/src/com/android/settings/development/WifiScanThrottlingPreferenceControllerTest.java
View File

@@ -16,16 +16,11 @@
package com.android.settings.development;
import static com.android.settings.development.WifiScanThrottlingPreferenceController.SETTING_THROTTLING_ENABLE_VALUE_OFF;
import static com.android.settings.development.WifiScanThrottlingPreferenceController.SETTING_THROTTLING_ENABLE_VALUE_ON;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.provider.Settings;
import android.net.wifi.WifiManager;
import androidx.preference.PreferenceScreen;
import androidx.preference.SwitchPreference;
@@ -36,7 +31,6 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class WifiScanThrottlingPreferenceControllerTest {
@@ -45,14 +39,16 @@ public class WifiScanThrottlingPreferenceControllerTest {
private SwitchPreference mPreference;
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
private Context mContext;
@Mock
private WifiManager mWifiManager;
private WifiScanThrottlingPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
mController = new WifiScanThrottlingPreferenceController(mContext);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
@@ -63,27 +59,19 @@ public class WifiScanThrottlingPreferenceControllerTest {
public void onPreferenceChanged_turnOnScanThrottling() {
mController.onPreferenceChange(mPreference, true /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED, 1 /* default */);
assertThat(mode).isEqualTo(SETTING_THROTTLING_ENABLE_VALUE_ON);
verify(mWifiManager).setScanThrottleEnabled(true);
}
@Test
public void onPreferenceChanged_turnOffScanThrottling() {
mController.onPreferenceChange(mPreference, false /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED, 1 /* default */);
assertThat(mode).isEqualTo(SETTING_THROTTLING_ENABLE_VALUE_OFF);
verify(mWifiManager).setScanThrottleEnabled(false);
}
@Test
public void updateState_preferenceShouldBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED,
SETTING_THROTTLING_ENABLE_VALUE_ON);
when(mWifiManager.isScanThrottleEnabled()).thenReturn(true);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
@@ -91,9 +79,7 @@ public class WifiScanThrottlingPreferenceControllerTest {
@Test
public void updateState_preferenceShouldNotBeChecked() {
Settings.Global.putInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED,
SETTING_THROTTLING_ENABLE_VALUE_OFF);
when(mWifiManager.isScanThrottleEnabled()).thenReturn(false);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
@@ -102,10 +88,7 @@ public class WifiScanThrottlingPreferenceControllerTest {
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.WIFI_SCAN_THROTTLE_ENABLED, 1 /* default */);
assertThat(mode).isEqualTo(SETTING_THROTTLING_ENABLE_VALUE_ON);
verify(mWifiManager).setScanThrottleEnabled(true);
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(true);
}