From 3d56d5924b0e14251a3220e65bd6cf829ea211c7 Mon Sep 17 00:00:00 2001
From: Sooraj Sasindran <sasindran@google.com>
Date: Tue, 2 Oct 2018 11:04:27 -0700
Subject: [PATCH] Use updated APIs for CBRS

Use updated APIs for CBRS

Bug: 117156243
Test: verified enable disable using UI
Change-Id: Ib6be6479c9f51b7c2dd80db5f7971a8c7e820954
---
 .../development/CbrsDataSwitchPreferenceController.java   | 4 ++--
 .../CbrsDataSwitchPreferenceControllerTest.java           | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
index ec1f8e0d155..d5c78e8b752 100644
--- a/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
+++ b/src/com/android/settings/development/CbrsDataSwitchPreferenceController.java
@@ -54,12 +54,12 @@ public class CbrsDataSwitchPreferenceController extends DeveloperOptionsPreferen
     @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);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/CbrsDataSwitchPreferenceControllerTest.java
index be9b1231682..0f2239079db 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 final class CbrsDataSwitchPreferenceControllerTest {
     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 @@ public final class CbrsDataSwitchPreferenceControllerTest {
 
     @Test
     public void updateState_settingDisabled_shouldDisablePreference() {
-        mTelephonyManager.setAlternativeNetworkAccessState(false);
+        mTelephonyManager.setAlternativeNetworkState(false);
         mController.updateState(mPreference);
 
         assertThat(mPreference.isChecked()).isFalse();