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

Commit 6d0b481b authored by Jean Chalard's avatar Jean Chalard Committed by Automerger Merge Worker
Browse files

Merge "Use ConnectivityManager.MockHelpers" into main am: b82172dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3538922



Change-Id: I85bee5273da00ba6012cacf9b45c7b2dfb51abd4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f26e9b4 b82172dd

tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java

+3 −2
Original line number Diff line number Diff line
@@ -809,7 +809,8 @@ public class ContextFixture implements TestFixture<Context> { 
        doReturn(mBundle).when(mCarrierConfigManager).getConfig();

        doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString());

        doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId();

        doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent(

        doReturn(ConnectivityManager.MockHelpers.registerNetworkAgentResult(mNetwork, null))

                .when(mConnectivityManager).registerNetworkAgent(

                        any(), any(), any(), any(), any(), any(), anyInt());



        doReturn(true).when(mEuiccManager).isEnabled();