PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename WifiManager.enableVerboseLogging/getVerboseLoggingLevel

Browse Source 
- Rename enableVerboseLogging -> setVerboseLoggingEnabled
- Rename getVerboseLoggingLevel -> isVerboseLoggingEnabled
- Converted getter/setter to take/return boolean

Bug: 144925765
Test: compiles
Change-Id: I6406a91b4692871cf558a63f8510f1734ae48f93
This commit is contained in:
David Su
2020-01-23 13:57:33 -08:00
parent 150a7f0ac1
commit dadef49214
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/development/WifiVerboseLoggingPreferenceController.java
View File

@@ -52,13 +52,13 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
final boolean isEnabled = (Boolean) newValue; final boolean isEnabled = (Boolean) newValue;
mWifiManager.enableVerboseLogging(isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF); mWifiManager.setVerboseLoggingEnabled(isEnabled);
return true; return true;
} }
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
final boolean enabled = mWifiManager.getVerboseLoggingLevel() > 0; final boolean enabled = mWifiManager.isVerboseLoggingEnabled();
((SwitchPreference) mPreference).setChecked(enabled); ((SwitchPreference) mPreference).setChecked(enabled);
} }
@@ -66,7 +66,7 @@ public class WifiVerboseLoggingPreferenceController extends DeveloperOptionsPref
@Override @Override
protected void onDeveloperOptionsSwitchDisabled() { protected void onDeveloperOptionsSwitchDisabled() {
super.onDeveloperOptionsSwitchDisabled(); super.onDeveloperOptionsSwitchDisabled();
mWifiManager.enableVerboseLogging(SETTING_VALUE_OFF); mWifiManager.setVerboseLoggingEnabled(false);
((SwitchPreference) mPreference).setChecked(false); ((SwitchPreference) mPreference).setChecked(false);
} }
} }

13
tests/robotests/src/com/android/settings/development/WifiVerboseLoggingPreferenceControllerTest.java
View File

@@ -59,21 +59,19 @@ public class WifiVerboseLoggingPreferenceControllerTest {
public void onPreferenceChange_settingEnabled_shouldEnableVerboseLogging() { public void onPreferenceChange_settingEnabled_shouldEnableVerboseLogging() {
mController.onPreferenceChange(mPreference, true /* new value */); mController.onPreferenceChange(mPreference, true /* new value */);
verify(mWifiManager).enableVerboseLogging( verify(mWifiManager).setVerboseLoggingEnabled(true);
WifiVerboseLoggingPreferenceController.SETTING_VALUE_ON);
} }
@Test @Test
public void onPreferenceChange_settingDisabled_shouldDisablVerboseLogging() { public void onPreferenceChange_settingDisabled_shouldDisablVerboseLogging() {
mController.onPreferenceChange(mPreference, false /* new value */); mController.onPreferenceChange(mPreference, false /* new value */);
verify(mWifiManager).enableVerboseLogging( verify(mWifiManager).setVerboseLoggingEnabled(false);
WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
} }
@Test @Test
public void updateState_settingEnabled_shouldEnablePreference() { public void updateState_settingEnabled_shouldEnablePreference() {
when(mWifiManager.getVerboseLoggingLevel()).thenReturn(1); when(mWifiManager.isVerboseLoggingEnabled()).thenReturn(true);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setChecked(true); verify(mPreference).setChecked(true);
@@ -81,7 +79,7 @@ public class WifiVerboseLoggingPreferenceControllerTest {
@Test @Test
public void updateState_settingDisabled_shouldDisablePreference() { public void updateState_settingDisabled_shouldDisablePreference() {
when(mWifiManager.getVerboseLoggingLevel()).thenReturn(0); when(mWifiManager.isVerboseLoggingEnabled()).thenReturn(false);
mController.updateState(mPreference); mController.updateState(mPreference);
verify(mPreference).setChecked(false); verify(mPreference).setChecked(false);
@@ -91,8 +89,7 @@ public class WifiVerboseLoggingPreferenceControllerTest {
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() { public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled(); mController.onDeveloperOptionsSwitchDisabled();
verify(mWifiManager) verify(mWifiManager).setVerboseLoggingEnabled(false);
.enableVerboseLogging(WifiVerboseLoggingPreferenceController.SETTING_VALUE_OFF);
verify(mPreference).setEnabled(false); verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false); verify(mPreference).setChecked(false);
} }