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

Merge "Use updated APIs for CBRS"

Browse Source
This commit is contained in:
Sooraj Sasindran
2018-10-06 03:41:26 +00:00
committed by Android (Google) Code Review
parent ebb83a3953 3d56d5924b
commit 6607361db7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
View File

@@ -54,12 +54,12 @@ public class CbrsDataSwitchPreferenceController extends DeveloperOptionsPreferen
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
boolean state = (Boolean)newValue; boolean state = (Boolean)newValue;
return mTelephonyManager.setAlternativeNetworkAccessState(state); return mTelephonyManager.setAlternativeNetworkState(state);
} }
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
boolean state = mTelephonyManager.isAlternativeNetworkAccessEnabled(); boolean state = mTelephonyManager.isAlternativeNetworkEnabled();
((SwitchPreference) mPreference).setChecked(state); ((SwitchPreference) mPreference).setChecked(state);
} }

8
tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
View File

@@ -62,19 +62,19 @@ public final class CbrsDataSwitchPreferenceControllerTest {
public void onPreferenceChanged_settingEnabled_shouldEnableANAS() { public void onPreferenceChanged_settingEnabled_shouldEnableANAS() {
mController.onPreferenceChange(mPreference, true); mController.onPreferenceChange(mPreference, true);
assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isTrue(); assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isTrue();
} }
@Test @Test
public void onPreferenceChanged_settingDisabled_shouldDisableANAS() { public void onPreferenceChanged_settingDisabled_shouldDisableANAS() {
mController.onPreferenceChange(mPreference, false); mController.onPreferenceChange(mPreference, false);
assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isFalse(); assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isFalse();
} }
@Test @Test
public void updateState_settingEnabled_shouldEnablePreference() { public void updateState_settingEnabled_shouldEnablePreference() {
mTelephonyManager.setAlternativeNetworkAccessState(true); mTelephonyManager.setAlternativeNetworkState(true);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.isChecked()).isTrue(); assertThat(mPreference.isChecked()).isTrue();
@@ -82,7 +82,7 @@ public final class CbrsDataSwitchPreferenceControllerTest {
@Test @Test
public void updateState_settingDisabled_shouldDisablePreference() { public void updateState_settingDisabled_shouldDisablePreference() {
mTelephonyManager.setAlternativeNetworkAccessState(false); mTelephonyManager.setAlternativeNetworkState(false);
mController.updateState(mPreference); mController.updateState(mPreference);
assertThat(mPreference.isChecked()).isFalse(); assertThat(mPreference.isChecked()).isFalse();