diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java index f7ed1d0e4ce..50c55397681 100644 --- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java @@ -31,7 +31,6 @@ import android.telephony.TelephonyManager; import android.text.TextUtils; import android.util.Log; - import androidx.annotation.VisibleForTesting; import androidx.lifecycle.Lifecycle; import androidx.lifecycle.LifecycleObserver; @@ -42,8 +41,8 @@ import androidx.preference.PreferenceScreen; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneConstants; -import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants; import com.android.settings.R; +import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants; import java.util.ArrayList; import java.util.List; @@ -176,7 +175,7 @@ public class EnabledNetworkModePreferenceController extends private void updatePreferenceEntries(ListPreference preference) { final int phoneType = mTelephonyManager.getPhoneType(); final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId); - if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) { + if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) { final int lteForced = android.provider.Settings.Global.getInt( mContext.getContentResolver(), android.provider.Settings.Global.LTE_SERVICE_FORCED + mSubId, @@ -221,7 +220,7 @@ public class EnabledNetworkModePreferenceController extends } } } - } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) { + } else if (phoneType == TelephonyManager.PHONE_TYPE_GSM) { if (MobileNetworkUtils.isTdscdmaSupported(mContext, mSubId)) { preference.setEntries( R.array.enabled_networks_tdscdma_choices); @@ -529,7 +528,7 @@ public class EnabledNetworkModePreferenceController extends preference.setValue( Integer.toString(TelephonyManagerConstants .NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA)); - if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA + if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA || mIsGlobalCdma || MobileNetworkUtils.isWorldMode(mContext, mSubId)) { preference.setSummary(R.string.network_global); @@ -553,7 +552,7 @@ public class EnabledNetworkModePreferenceController extends case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA: preference.setValue( Integer.toString(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA)); - if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA + if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA || mIsGlobalCdma || MobileNetworkUtils.isWorldMode(mContext, mSubId)) { preference.setSummary(R.string.network_global); diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index 75e0bb12698..e8ffa38b4e2 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -51,7 +51,6 @@ import androidx.annotation.VisibleForTesting; import com.android.ims.ImsException; import com.android.ims.ImsManager; import com.android.internal.telephony.Phone; -import com.android.internal.telephony.PhoneConstants; import com.android.internal.util.ArrayUtils; import com.android.settings.R; import com.android.settings.Utils; @@ -299,7 +298,7 @@ public class MobileNetworkUtils { CarrierConfigManager.class).getConfigForSubId(subId); - if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) { + if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) { return true; } else if (carrierConfig != null && !carrierConfig.getBoolean( @@ -358,7 +357,7 @@ public class MobileNetworkUtils { final PersistableBundle carrierConfig = context.getSystemService( CarrierConfigManager.class).getConfigForSubId(subId); - if (telephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) { + if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM) { return true; } else if (carrierConfig != null && !carrierConfig.getBoolean( diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java index 72be4f4c5bd..a4d16f2d1af 100644 --- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java +++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java @@ -156,7 +156,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: return R.string.preferred_network_mode_lte_tdscdma_cdma_evdo_gsm_wcdma_summary; case TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: - if (mTelephonyManager.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA + if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA || mIsGlobalCdma || MobileNetworkUtils.isWorldMode(mContext, mSubId)) { return R.string.preferred_network_mode_global_summary; diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java index d3628373357..e03da1009a3 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java @@ -24,10 +24,8 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Activity; import android.content.Context; import android.content.Intent; import android.os.PersistableBundle; @@ -36,7 +34,6 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import com.android.internal.telephony.PhoneConstants; import com.android.settings.network.ApnSettings; import com.android.settingslib.RestrictedPreference; @@ -46,7 +43,6 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -89,7 +85,7 @@ public class ApnPreferenceControllerTest { @Test public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() { - doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); @@ -99,7 +95,7 @@ public class ApnPreferenceControllerTest { @Test public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() { - doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); @@ -109,7 +105,7 @@ public class ApnPreferenceControllerTest { @Test public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() { - doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); @@ -119,7 +115,7 @@ public class ApnPreferenceControllerTest { @Test public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() { - doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null); assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); @@ -128,7 +124,7 @@ public class ApnPreferenceControllerTest { @Test public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() { - doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true); bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true); diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java index fc8fb160a62..d978feafe07 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java @@ -28,8 +28,8 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; -import android.content.Context; import android.content.ComponentName; +import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; @@ -38,16 +38,15 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import com.android.internal.telephony.PhoneConstants; import com.android.settingslib.RestrictedPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.mockito.ArgumentCaptor; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -90,7 +89,7 @@ public class CarrierPreferenceControllerTest { @Test public void getAvailabilityStatus_cdmaWithFlagOff_returnUnavailable() { - doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, false); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); @@ -100,7 +99,7 @@ public class CarrierPreferenceControllerTest { @Test public void getAvailabilityStatus_cdmaWithFlagOnreturnAvailable() { - doReturn(PhoneConstants.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); @@ -110,7 +109,7 @@ public class CarrierPreferenceControllerTest { @Test public void getAvailabilityStatus_gsmWithFlagOnreturnAvailable() { - doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); + doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType(); final PersistableBundle bundle = new PersistableBundle(); bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true); doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID); diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java index da3a7c4e9fc..bbb8aaca04e 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java @@ -39,7 +39,6 @@ import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; -import com.android.internal.telephony.PhoneConstants; import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants; import org.junit.Before; @@ -169,14 +168,14 @@ public class MobileNetworkUtilsTest { @Test public void isCdmaOptions_phoneTypeCdma_returnTrue() { - when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_CDMA); + when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA); assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue(); } @Test public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() { - when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM); + when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true); Settings.Global.putInt(mContext.getContentResolver(), @@ -188,7 +187,7 @@ public class MobileNetworkUtilsTest { @Test public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() { - when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM); + when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, false); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true); @@ -226,7 +225,7 @@ public class MobileNetworkUtilsTest { false); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true); mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false); - when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM); + when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM); assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1)) .isTrue();