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

Merge "Add corresponding code for the new NR condition" into rvc-dev am: dde2bfd209 am: b5a3893f76 am: 2772005888 am: 4210565481

Browse Source 
Change-Id: I785a1360fb3151a2249dcc0ace63e81f59a0048a
This commit is contained in:
TreeHugger Robot
2020-05-20 07:45:32 +00:00
committed by Automerger Merge Worker
parent 6ed90dc8c3 4210565481
commit 6b29e7a567
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
View File

@@ -155,6 +155,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@Test
public void updateState_5gWorldPhone_GlobalHasNr() {
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_NR_ENABLED_BOOL, true);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
mController.init(mLifecycle, SUB_ID);
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
@@ -168,6 +169,7 @@ public class EnabledNetworkModePreferenceControllerTest {
@Test
public void updateState_selectedOn5gItem() {
mPersistableBundle.putBoolean(CarrierConfigManager.KEY_NR_ENABLED_BOOL, true);
mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA);
mController.init(mLifecycle, SUB_ID);