Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: 9c5a63edd2 am: ac1478c9ce

Change-Id: Ib2d7898fc5a203017660995a29ef45bd3226d9fd
This commit is contained in:
Blake Kragten
2020-03-18 22:49:08 +00:00
committed by Automerger Merge Worker
2 changed files with 10 additions and 10 deletions

View File

@@ -88,20 +88,20 @@ public class EnhancedConnectivityPreferenceControllerTest {
}
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsDisabled();
public void onDeveloperOptionsDisabled_shouldEnablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
verify(mPreference).setEnabled(false);
verify(mPreference).setChecked(false);
verify(mPreference).setChecked(true);
assertThat(isSettingEnabled()).isFalse();
assertThat(isSettingEnabled()).isTrue();
}
private boolean isSettingEnabled() {
return Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_OFF
/* default off */)
EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
/* default on */)
== EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
}
}