Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
61bdf047a4
@@ -38,7 +38,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl
|
|||||||
@Override
|
@Override
|
||||||
public void updateState(Preference preference) {
|
public void updateState(Preference preference) {
|
||||||
final boolean settingsOn = Settings.Global.getInt(mContext.getContentResolver(),
|
final boolean settingsOn = Settings.Global.getInt(mContext.getContentResolver(),
|
||||||
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, 0) != 0;
|
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, 1) != 0;
|
||||||
|
|
||||||
((SwitchPreference) preference).setChecked(settingsOn);
|
((SwitchPreference) preference).setChecked(settingsOn);
|
||||||
}
|
}
|
||||||
|
@@ -81,6 +81,13 @@ public class WifiTetherAutoOffPreferenceControllerTest {
|
|||||||
assertThat(mSwitchPreference.isChecked()).isFalse();
|
assertThat(mSwitchPreference.isChecked()).isFalse();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateState_toggleDefaultOn() {
|
||||||
|
mController.updateState(mSwitchPreference);
|
||||||
|
|
||||||
|
assertThat(mSwitchPreference.isChecked()).isTrue();
|
||||||
|
}
|
||||||
|
|
||||||
private int getAutoOffSetting() {
|
private int getAutoOffSetting() {
|
||||||
return Settings.Global.getInt(mContext.getContentResolver(),
|
return Settings.Global.getInt(mContext.getContentResolver(),
|
||||||
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, OFF);
|
Settings.Global.SOFT_AP_TIMEOUT_ENABLED, OFF);
|
||||||
|
Reference in New Issue
Block a user