commit 6607361db7776e36fdf47e3efaa4075ce545c558
author Sooraj Sasindran <sasindran@google.com> Sat Oct 06 03:41:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 06 03:41:26 2018 +0000
tree 8fe302eb17e6b88db2fc961531b62faa48bfdd45
parent ebb83a395380b19457baf0afb59a8d777e2d0fbb
parent 3d56d5924b0e14251a3220e65bd6cf829ea211c7

Merge "Use updated APIs for CBRS"

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

diff --git a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
index ec1f8e0..d5c78e8 100644
--- a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
+++ b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
@@ -54,12 +54,12 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         boolean state = (Boolean)newValue;
-        return mTelephonyManager.setAlternativeNetworkAccessState(state);
+        return mTelephonyManager.setAlternativeNetworkState(state);
     }
 
     @Override
     public void updateState(Preference preference) {
-        boolean state = mTelephonyManager.isAlternativeNetworkAccessEnabled();
+        boolean state = mTelephonyManager.isAlternativeNetworkEnabled();
         ((SwitchPreference) mPreference).setChecked(state);
     }
 

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

diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
index be9b123..0f22390 100644
--- a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
@@ -62,19 +62,19 @@
     public void onPreferenceChanged_settingEnabled_shouldEnableANAS() {
         mController.onPreferenceChange(mPreference, true);
 
-        assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isTrue();
+        assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isTrue();
     }
 
     @Test
     public void onPreferenceChanged_settingDisabled_shouldDisableANAS() {
         mController.onPreferenceChange(mPreference, false);
 
-        assertThat(mTelephonyManager.isAlternativeNetworkAccessEnabled()).isFalse();
+        assertThat(mTelephonyManager.isAlternativeNetworkEnabled()).isFalse();
     }
 
     @Test
     public void updateState_settingEnabled_shouldEnablePreference() {
-        mTelephonyManager.setAlternativeNetworkAccessState(true);
+        mTelephonyManager.setAlternativeNetworkState(true);
         mController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isTrue();
@@ -82,7 +82,7 @@
 
     @Test
     public void updateState_settingDisabled_shouldDisablePreference() {
-        mTelephonyManager.setAlternativeNetworkAccessState(false);
+        mTelephonyManager.setAlternativeNetworkState(false);
         mController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isFalse();