Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07933cb9 authored by Fan Zhang's avatar Fan Zhang
Browse files

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
parent 6718986b

src/com/android/settings/development/MobileDataAlwaysOnPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

    }

}

tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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);

    }

}