Replace some configs with CarrierConfig

Replace the following config with CarrierConfig
- config_enabled_lte
- config_support_tdscdma
- config_support_tdscdma_on_roaming_networks
- carrier settings activity package/class name

Bug: 115429501
Test: make -j40 ROBOTEST_FILTER=telephony RunSettingsRoboTests
Change-Id: I3d973f926813c01fff6fcff50b3392c4eff69eb8
This commit is contained in:
Pengquan Meng
2018-11-05 14:01:11 -08:00
parent 92792ee806
commit b8d59fc9f8
5 changed files with 22 additions and 41 deletions

View File

@@ -165,7 +165,8 @@ public class MobileNetworkUtilsTest {
@Test
public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() {
when(mTelephonyManager.getPhoneType()).thenReturn(PhoneConstants.PHONE_TYPE_GSM);
when(mContext.getString(R.string.config_world_mode)).thenReturn("true");
mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
Settings.Global.putInt(mContext.getContentResolver(),
android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
TelephonyManager.NETWORK_MODE_LTE_GSM_WCDMA);