Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26e8e6bf authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge changes from topic "cp_ims_fix_wfc_roaming"

am: e341ca18

Change-Id: I6953bd90c63000ffd05aa1eff5315bc2835c2d0d
parents ba53661f e341ca18
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -318,10 +318,11 @@ public class ImsManagerTest extends TelephonyTest {
        doReturn(true).when(mTelephonyManager).isNetworkRoaming(eq(mSubId[0]));
        // Turn on WFC
        imsManager.setWfcSetting(true);
        // Roaming mode (WIFI_PREFERRED) should be set. With 1000 ms timeout.
        // User defined setting for Roaming mode (WIFI_ONLY) should be set independent of whether or
        // not WFC mode is editable. With 1000 ms timeout.
        verify(mImsConfigImplBaseMock, timeout(1000)).setConfig(
                eq(ImsConfig.ConfigConstants.VOICE_OVER_WIFI_MODE),
                eq(WFC_IMS_ROAMING_MODE_DEFAULT_VAL));
                eq(ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY));

        // Not roaming
        doReturn(false).when(mTelephonyManager).isNetworkRoaming(eq(mSubId[0]));