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

Commit 28b8883c authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'networkrequest_private' into nyc-mr1-dev 

* changes:
  Keep ConnectivityServiceMock in sync with reality.
  Keep telephony mocks in sync with NetworkRequest changes.
parents 27bec9b4 4be10a24

tests/telephonytests/src/com/android/internal/telephony/dataconnection/ApnContextTest.java

+2 −2
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ public class ApnContextTest extends TelephonyTest { 
    @SmallTest

    public void testNetworkRequest() throws Exception {

        LocalLog log = new LocalLog(3);

        NetworkCapabilities nc = new NetworkCapabilities();

        NetworkRequest nr = new NetworkRequest(nc, 0, 0);

        NetworkRequest nr = new NetworkRequest.Builder().build();

        mApnContext.requestNetwork(nr, log);



        verify(mDcTracker, times(1)).setEnabled(eq(DctConstants.APN_DEFAULT_ID), eq(true));

        mApnContext.requestNetwork(nr, log);

        verify(mDcTracker, times(1)).setEnabled(eq(DctConstants.APN_DEFAULT_ID), eq(true));

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+2 −3
Original line number Diff line number Diff line
@@ -735,9 +735,8 @@ public class DcTrackerTest extends TelephonyTest { 
        mDct.sendMessage(mDct.obtainMessage(intArgumentCaptor.getValue(), null));

        waitForMs(200);



        NetworkCapabilities nc = new NetworkCapabilities();

        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET);

        NetworkRequest nr = new NetworkRequest(nc, 0, 0);

        NetworkRequest nr = new NetworkRequest.Builder()

                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET).build();

        LocalLog l = new LocalLog(100);

        mDct.requestNetwork(nr, l);

        waitForMs(200);

tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java

+5 −6
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
        NetworkAgentInfo nai = mNetworkAgentInfos.get(msg.replyTo);

        if (nai != null) {

            if (DBG) {

                log(nai.name() + " got DISCONNECTED, was satisfying " + nai.networkRequests.size());

                log(nai.name() + " got DISCONNECTED, was satisfying " + nai.numNetworkRequests());

            }

            // A network agent has disconnected.

            // TODO - if we move the logic to the network agent (have them disconnect
@@ -755,9 +755,8 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
        }



        NetworkRequest networkRequest = new NetworkRequest(networkCapabilities, legacyType,

                nextNetworkRequestId());

        NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder,

                NetworkRequestInfo.REQUEST);

                nextNetworkRequestId(), NetworkRequest.Type.REQUEST);

        NetworkRequestInfo nri = new NetworkRequestInfo(messenger, networkRequest, binder, true);

        if (DBG) log("requestNetwork for " + nri);



        mHandler.sendMessage(mHandler.obtainMessage(EVENT_REGISTER_NETWORK_REQUEST, nri));
@@ -949,8 +948,8 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
    }



    private void sendUpdatedScoreToFactories(NetworkAgentInfo nai) {

        for (int i = 0; i < nai.networkRequests.size(); i++) {

            NetworkRequest nr = nai.networkRequests.valueAt(i);

        for (int i = 0; i < nai.numNetworkRequests(); i++) {

            NetworkRequest nr = nai.requestAt(i);

            // Don't send listening requests to factories. b/17393458

            if (!isRequest(nr)) continue;

                sendUpdatedScoreToFactories(nr, nai.getCurrentScore());