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

Commit ff83f1d7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Resolve ambiguous argument." am: 486a8664 am: 00df02f1 am:... 

Merge "Resolve ambiguous argument." am: 486a8664 am: 00df02f1 am: 12e651f3 am: 76a9b6e0 am: c657bdf2

Change-Id: I5d7deea82d7114fa38f37b90f94fe7e6073bd848
parents 88db0a41 c657bdf2

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

+2 −2
Original line number Diff line number Diff line
@@ -3723,7 +3723,7 @@ public class ConnectivityServiceTest { 
        mCm.requestNetwork(nr, networkCallback, timeoutMs);



        // pass timeout and validate that UNAVAILABLE is called

        networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, null);

        networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, (Network) null);



        // create a network satisfying request - validate that request not triggered

        mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
@@ -3814,7 +3814,7 @@ public class ConnectivityServiceTest { 
            // Simulate the factory releasing the request as unfulfillable and expect onUnavailable!

            testFactory.triggerUnfulfillable(requests.get(newRequestId));



            networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, null);

            networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, (Network) null);

            testFactory.waitForRequests();



            // unregister network callback - a no-op (since already freed by the