PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename calls to isGlobalModeEnabled" into rvc-dev am: 4d59bce21b am: f8139ef988 am: 6757a04c18 am: 185fa23d45

Browse Source 
Change-Id: I0f65598bef92ab99f76b7cadccf10da18b6a7557
This commit is contained in:
Automerger Merge Worker
2020-03-02 19:19:52 +00:00
parent c3684ebd22 185fa23d45
commit a68ee602fb
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
View File

@@ -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);