From 83893a3ffdf85d5ef768bbebd958c91284224c37 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 27 Feb 2020 15:52:18 -0800 Subject: [PATCH] Rename calls to isGlobalModeEnabled Test: atest FrameworksTelephonyTests Bug: 148603998 Change-Id: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 Merged-In: If302350cfea7b2cd2cd25906dd1dd6a6d192a5d6 --- src/com/android/settings/CryptKeeper.java | 2 +- .../settings/deviceinfo/imei/ImeiInfoDialogController.java | 2 +- .../telephony/DataServiceSetupPreferenceController.java | 2 +- .../telephony/EnabledNetworkModePreferenceController.java | 4 ++-- .../telephony/PreferredNetworkModePreferenceController.java | 4 ++-- .../telephony/DataServiceSetupPreferenceControllerTest.java | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index ca137b7bf07..78decdf3637 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -915,7 +915,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList * phone that has no encryption. */ private final void setAirplaneModeIfNecessary() { - if (!getTelephonyManager().isGlobalModeEnabled()) { + if (!getTelephonyManager().isLteCdmaEvdoGsmWcdmaEnabled()) { Log.d(TAG, "Going into airplane mode."); Settings.Global.putInt(getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1); final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED); diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 2ee77d9d768..98f0bc42bfe 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -146,7 +146,7 @@ public class ImeiInfoDialogController { @VisibleForTesting boolean isCdmaLteEnabled() { - return mTelephonyManager.isGlobalModeEnabled(); + return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled(); } @VisibleForTesting diff --git a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java index da2bff739f1..c200d5e0dda 100644 --- a/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java +++ b/src/com/android/settings/network/telephony/DataServiceSetupPreferenceController.java @@ -52,7 +52,7 @@ public class DataServiceSetupPreferenceController extends TelephonyBasePreferenc && carrierConfig != null && !carrierConfig.getBoolean( CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL) - && mTelephonyManager.isGlobalModeEnabled() && !TextUtils.isEmpty(mSetupUrl) + && mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() && !TextUtils.isEmpty(mSetupUrl) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE; } diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index 2866b5483e4..916c643dc64 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -151,7 +151,7 @@ public class EnabledNetworkModePreferenceController extends mTelephonyManager = mContext.getSystemService(TelephonyManager.class) .createForSubscriptionId(mSubId); - mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled() + mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL); mShow4GForLTE = carrierConfig != null ? carrierConfig.getBoolean( @@ -183,7 +183,7 @@ public class EnabledNetworkModePreferenceController extends mContext.getContentResolver(), android.provider.Settings.Global.PREFERRED_NETWORK_MODE + mSubId, Phone.PREFERRED_NT_MODE); - if (mTelephonyManager.isGlobalModeEnabled()) { + if (mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled()) { if (lteForced == 0) { preference.setEntries( R.array.enabled_networks_cdma_choices); diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java index 062b4edba0b..896c28234bf 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -100,7 +100,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe mTelephonyManager = mContext.getSystemService(TelephonyManager.class) .createForSubscriptionId(mSubId); - mIsGlobalCdma = mTelephonyManager.isGlobalModeEnabled() + mIsGlobalCdma = mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_CDMA_CHOICES_BOOL); } @@ -127,7 +127,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe case TelephonyManagerConstants.NETWORK_MODE_GSM_UMTS: return R.string.preferred_network_mode_gsm_wcdma_summary; case TelephonyManagerConstants.NETWORK_MODE_CDMA_EVDO: - return mTelephonyManager.isGlobalModeEnabled() + return mTelephonyManager.isLteCdmaEvdoGsmWcdmaEnabled() ? R.string.preferred_network_mode_cdma_summary : R.string.preferred_network_mode_cdma_evdo_summary; case TelephonyManagerConstants.NETWORK_MODE_CDMA_NO_EVDO: diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java index ddfae6401ed..3eb3caf0554 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java @@ -90,7 +90,7 @@ public class DataServiceSetupPreferenceControllerTest { @Test public void getAvailabilityStatus_allConfigOn_returnAvailable() { - doReturn(true).when(mTelephonyManager).isGlobalModeEnabled(); + doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); @@ -101,7 +101,7 @@ public class DataServiceSetupPreferenceControllerTest { public void getAvailabilityStatus_missUrl_returnUnavailable() { Settings.Global.putString(mContext.getContentResolver(), Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, ""); - doReturn(true).when(mTelephonyManager).isGlobalModeEnabled(); + doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); @@ -113,7 +113,7 @@ public class DataServiceSetupPreferenceControllerTest { @Test public void getAvailabilityStatus_notCdma_returnUnavailable() { - doReturn(false).when(mTelephonyManager).isGlobalModeEnabled(); + doReturn(false).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled(); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false);