Rename WifiManager.enableVerboseLogging/getVerboseLoggingLevel
- Rename enableVerboseLogging -> setVerboseLoggingEnabled
- Rename getVerboseLoggingLevel -> isVerboseLoggingEnabled
- Converted getter/setter to take/return boolean
Bug: 144925765
Test: compiles
Change-Id: I6406a91b4692871cf558a63f8510f1734ae48f93
diff --git a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
index de53a2d..92ed65d 100644
--- a/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
+++ b/src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
@@ -52,13 +52,13 @@
@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 @@
@Override
protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled();
- mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF);
+ mWifiManager.setVerboseLoggingEnabled(false);
((SwitchPreference) mPreference).setChecked(false);
}
}
diff --git a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
index c4041e0..fec8e0c 100644
--- a/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
@@ -59,21 +59,19 @@
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 @@
@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 void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
- verify(mWifiManager)
- .enableVerboseLogging(WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
+ verify(mWifiManager).setVerboseLoggingEnabled(false);
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
}