From 70d71748f4c0b00926ce0c38e25cd5a135eb6348 Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Tue, 13 Mar 2018 17:20:16 -0700 Subject: [PATCH] Change default value for SOFT_AP_TIMEOUT_ENABLED Change the default value to 1. Change-Id: I78a69d6224ad417537be59ce51357e1093d6bae4 Fixes: 73501186 Test: RunSettingsRoboTests --- .../wifi/tether/WifiTetherAutoOffPreferenceController.java | 2 +- .../wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java index 5fa4e25b02..8fdae803bc 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceController.java @@ -38,7 +38,7 @@ public class WifiTetherAutoOffPreferenceController extends BasePreferenceControl @Override public void updateState(Preference preference) { 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); } diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java index 2b14e88f86..c553764b4f 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherAutoOffPreferenceControllerTest.java @@ -81,6 +81,13 @@ public class WifiTetherAutoOffPreferenceControllerTest { assertThat(mSwitchPreference.isChecked()).isFalse(); } + @Test + public void testUpdateState_toggleDefaultOn() { + mController.updateState(mSwitchPreference); + + assertThat(mSwitchPreference.isChecked()).isTrue(); + } + private int getAutoOffSetting() { return Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.SOFT_AP_TIMEOUT_ENABLED, OFF); -- 2.11.0