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

Commit 61337104 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "Rename WifiManager.enableVerboseLogging/getVerboseLoggingLevel"

parents f123108d dadef492

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

+3 −3
Original line number Diff line number Diff line
@@ -52,13 +52,13 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref 
    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

        mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);

        mWifiManager.setVerboseLoggingEnabled(isEnabled);

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0;

        final boolean enabled = mWifiManager.isVerboseLoggingEnabled();

        ((SwitchPreference) mPreference).setChecked(enabled);



    }
@@ -66,7 +66,7 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref 
    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        super.onDeveloperOptionsSwitchDisabled();

        mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);

        mWifiManager.setVerboseLoggingEnabled(false);

        ((SwitchPreference) mPreference).setChecked(false);

    }

}

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

+5 −8
Original line number Diff line number Diff line
@@ -59,21 +59,19 @@ public class WifiVerboseLoggingPreferenceControllerTest { 
    public void onPreferenceChange_settingEnabled_shouldEnableVerboseLogging() {

        mController.onPreferenceChange(mPreference, true /* new value */);



        verify(mWifiManager).enableVerboseLogging(

                WifiVerboseLoggingPreferenceController.SETTING_VALUE_ON);

        verify(mWifiManager).setVerboseLoggingEnabled(true);

    }



    @Test

    public void onPreferenceChange_settingDisabled_shouldDisablVerboseLogging() {

        mController.onPreferenceChange(mPreference, false /* new value */);



        verify(mWifiManager).enableVerboseLogging(

                WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);

        verify(mWifiManager).setVerboseLoggingEnabled(false);

    }



    @Test

    public void updateState_settingEnabled_shouldEnablePreference() {

        when(mWifiManager.getVerboseLoggingLevel()).thenReturn(1);

        when(mWifiManager.isVerboseLoggingEnabled()).thenReturn(true);

        mController.updateState(mPreference);



        verify(mPreference).setChecked(true);
@@ -81,7 +79,7 @@ public class WifiVerboseLoggingPreferenceControllerTest { 


    @Test

    public void updateState_settingDisabled_shouldDisablePreference() {

        when(mWifiManager.getVerboseLoggingLevel()).thenReturn(0);

        when(mWifiManager.isVerboseLoggingEnabled()).thenReturn(false);

        mController.updateState(mPreference);



        verify(mPreference).setChecked(false);
@@ -91,8 +89,7 @@ public class WifiVerboseLoggingPreferenceControllerTest { 
    public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {

        mController.onDeveloperOptionsSwitchDisabled();



        verify(mWifiManager)

            .enableVerboseLogging(WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);

        verify(mWifiManager).setVerboseLoggingEnabled(false);

        verify(mPreference).setEnabled(false);

        verify(mPreference).setChecked(false);

    }