From 07933cb96788ea5005a98e6c7413371cd8f246c7 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 12 Dec 2018 13:40:22 -0800 Subject: [PATCH] Set setting back to default when turning off dev option When turning off developer options, mobile data always on setting should be set back to default, which is ON not OFF. Change-Id: I257ba108976b05162fa3cea6e48f3490e9c64f80 Fixes: 119719605 Test: robotests --- .../development/MobileDataAlwaysOnPreferenceController.java | 4 ++-- .../MobileDataAlwaysOnPreferenceControllerTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java index 78054ae2ab7..b2fa693104e 100644 --- a/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java +++ b/src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java @@ -66,7 +66,7 @@ public class MobileDataAlwaysOnPreferenceController extends protected void onDeveloperOptionsSwitchDisabled() { super.onDeveloperOptionsSwitchDisabled(); Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, - SETTING_VALUE_OFF); - ((SwitchPreference) mPreference).setChecked(false); + SETTING_VALUE_ON); + ((SwitchPreference) mPreference).setChecked(true); } } diff --git a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java index a578429d63c..91bdad39f91 100644 --- a/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java @@ -96,13 +96,13 @@ public class MobileDataAlwaysOnPreferenceControllerTest { } @Test - public void onDeveloperOptionsSwitchDisabled_preferenceShouldBeDisabled() { + public void onDeveloperOptionsSwitchDisabled_shouldDisableMobileDataAlwaysOn() { mController.onDeveloperOptionsSwitchDisabled(); final int mode = Settings.Global.getInt(mContext.getContentResolver(), Settings.Global.MOBILE_DATA_ALWAYS_ON, -1 /* default */); - assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_OFF); + assertThat(mode).isEqualTo(MobileDataAlwaysOnPreferenceController.SETTING_VALUE_ON); verify(mPreference).setEnabled(false); - verify(mPreference).setChecked(false); + verify(mPreference).setChecked(true); } }