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

Commit b9650d89 authored by Chalard Jean's avatar Chalard Jean Committed by Gerrit Code Review
Browse files

Merge "Address remaining comments on aosp/1607893"

parents af116298 410ab881

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

+2 −3
Original line number Diff line number Diff line
@@ -11402,7 +11402,6 @@ public class ConnectivityServiceTest { 
        mSystemDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);

        mDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);

        mProfileDefaultNetworkCallback.assertNoCallback();

        waitForIdle();

        inOrder.verify(mMockNetd).networkDestroy(mCellNetworkAgent.getNetwork().netId);















        mCellNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_CELLULAR);









@@ -11421,7 +11420,6 @@ public class ConnectivityServiceTest {













        assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback);















        inOrder.verify(mMockNetd).networkAddUidRanges(mCellNetworkAgent.getNetwork().netId,















                uidRangeFor(testHandle));













        waitForIdle();















        inOrder.verify(mMockNetd).networkDestroy(workAgent.getNetwork().netId);





























        mCellNetworkAgent.disconnect();









@@ -11429,6 +11427,8 @@ public class ConnectivityServiceTest {













        mDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);















        mProfileDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, mCellNetworkAgent);



























        // Waiting for the handler to be idle before checking for networkDestroy is necessary













        // here because ConnectivityService calls onLost before the network is fully torn down.















        waitForIdle();















        inOrder.verify(mMockNetd).networkDestroy(mCellNetworkAgent.getNetwork().netId);
























@@ -11458,7 +11458,6 @@ public class ConnectivityServiceTest {













        workAgent2.disconnect();















        mProfileDefaultNetworkCallback.expectCallback(CallbackEntry.LOST, workAgent2);















        assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback);













        waitForIdle();















        inOrder.verify(mMockNetd).networkDestroy(workAgent2.getNetwork().netId);





























        assertNoCallbacks(mSystemDefaultNetworkCallback, mDefaultNetworkCallback,