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

Commit bfd6610a authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Set extraInfo on cellular TestNetworkAgents." am: f0f69b46 am: 55c89d19 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id194278af5a07dea4d0641c0884c46e77c931938
parents 4164dc4a 55c89d19

tests/net/integration/util/com/android/server/NetworkAgentWrapper.java

+21 −8
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
    private final HandlerThread mHandlerThread;

    private final Context mContext;

    private final String mLogTag;

    private final NetworkAgentConfig mNetworkAgentConfig;



    private final ConditionVariable mDisconnected = new ConditionVariable();

    private final ConditionVariable mPreventReconnectReceived = new ConditionVariable();
@@ -115,13 +116,19 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
        mHandlerThread = new HandlerThread(mLogTag);

        mHandlerThread.start();



        mNetworkAgent = makeNetworkAgent(linkProperties, type, typeName);

        // extraInfo is set to "" by default in NetworkAgentConfig.

        final String extraInfo = (transport == TRANSPORT_CELLULAR) ? "internet.apn" : "";

        mNetworkAgentConfig = new NetworkAgentConfig.Builder()

                .setLegacyType(type)

                .setLegacyTypeName(typeName)

                .setLegacyExtraInfo(extraInfo)

                .build();

        mNetworkAgent = makeNetworkAgent(linkProperties, mNetworkAgentConfig);

    }



    protected InstrumentedNetworkAgent makeNetworkAgent(LinkProperties linkProperties,

            final int type, final String typeName)

            throws Exception {

        return new InstrumentedNetworkAgent(this, linkProperties, type, typeName);

            final NetworkAgentConfig nac) throws Exception {

        return new InstrumentedNetworkAgent(this, linkProperties, nac);

    }



    public static class InstrumentedNetworkAgent extends NetworkAgent {
@@ -129,11 +136,9 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
        private static final String PROVIDER_NAME = "InstrumentedNetworkAgentProvider";



        public InstrumentedNetworkAgent(NetworkAgentWrapper wrapper, LinkProperties lp,

                final int type, final String typeName) {

                NetworkAgentConfig nac) {

            super(wrapper.mContext, wrapper.mHandlerThread.getLooper(), wrapper.mLogTag,

                    wrapper.mNetworkCapabilities, lp, wrapper.mScore,

                    new NetworkAgentConfig.Builder()

                            .setLegacyType(type).setLegacyTypeName(typeName).build(),

                    wrapper.mNetworkCapabilities, lp, wrapper.mScore, nac,

                    new NetworkProvider(wrapper.mContext, wrapper.mHandlerThread.getLooper(),

                            PROVIDER_NAME));

            mWrapper = wrapper;
@@ -301,6 +306,14 @@ public class NetworkAgentWrapper implements TestableNetworkCallback.HasNetwork { 
        return mNetworkCapabilities;

    }



    public int getLegacyType() {

        return mNetworkAgentConfig.getLegacyType();

    }



    public String getExtraInfo() {

        return mNetworkAgentConfig.getLegacyExtraInfo();

    }



    public @NonNull ArrayTrackRecord<CallbackType>.ReadHead getCallbackHistory() {

        return mCallbackHistory;

    }

tests/net/java/com/android/server/ConnectivityServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ public class ConnectivityServiceTest { 














        @Override















        protected InstrumentedNetworkAgent makeNetworkAgent(LinkProperties linkProperties,













                final int type, final String typeName) throws Exception {













                NetworkAgentConfig nac) throws Exception {















            mNetworkMonitor = mock(INetworkMonitor.class);





























            final Answer validateAnswer = inv -> {









@@ -737,8 +737,8 @@ public class ConnectivityServiceTest {













                    any() /* name */,















                    nmCbCaptor.capture());



























            final InstrumentedNetworkAgent na = new InstrumentedNetworkAgent(this, linkProperties,













                    type, typeName) {













            final InstrumentedNetworkAgent na =













                    new InstrumentedNetworkAgent(this, linkProperties, nac) {















                @Override















                public void networkStatus(int status, String redirectUrl) {















                    mRedirectUrl = redirectUrl;