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

Commit 5cfd8480 authored by Chiachang Wang's avatar Chiachang Wang Committed by Gerrit Code Review
Browse files

Merge "Update DcNetworkAgent for a small change to NetworkAgent"

parents c46dfae4 72cea09e

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public class DcNetworkAgent extends NetworkAgent { 
        super(dc.getHandler().getLooper(), phone.getContext(), "DcNetworkAgent", ni,

                dc.getNetworkCapabilities(), dc.getLinkProperties(), score, misc,

                factorySerialNumber);

        mTag = "DcNetworkAgent" + "-" + netId;

        mTag = "DcNetworkAgent" + "-" + network.netId;

        mPhone = phone;

        mNetworkCapabilities = dc.getNetworkCapabilities();

        mTransportType = transportType;

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

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.content.res.Resources; 
import android.database.Cursor;

import android.database.MatrixCursor;

import android.net.ConnectivityManager;

import android.net.Network;

import android.net.Uri;

import android.net.wifi.WifiManager;

import android.os.BatteryManager;
@@ -636,6 +637,9 @@ public class ContextFixture implements TestFixture<Context> { 
        //doReturn(mBundle).when(mCarrierConfigManager).getConfig(anyInt());

        doReturn(mBundle).when(mCarrierConfigManager).getConfig();



        doReturn(mock(Network.class)).when(mConnectivityManager).registerNetworkAgent(

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



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



        mConfiguration.locale = Locale.US;