LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Resolve ambiguous argument." am: 16cad96e9f

Browse Source 
Change-Id: I4c03bb6d16127929f4d60aa071aee18e8ac4c669
This commit is contained in:
Automerger Merge Worker
2020-03-14 03:52:51 +00:00
parent 438f8bbe71 16cad96e9f
commit 79a0b0096d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3723,7 +3723,7 @@ public class ConnectivityServiceTest {
mCm.requestNetwork(nr, networkCallback, timeoutMs); mCm.requestNetwork(nr, networkCallback, timeoutMs);
// pass timeout and validate that UNAVAILABLE is called // 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 // create a network satisfying request - validate that request not triggered
mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI); mWiFiNetworkAgent = new TestNetworkAgentWrapper(TRANSPORT_WIFI);
@@ -3814,7 +3814,7 @@ public class ConnectivityServiceTest {
// Simulate the factory releasing the request as unfulfillable and expect onUnavailable! // Simulate the factory releasing the request as unfulfillable and expect onUnavailable!
testFactory.triggerUnfulfillable(requests.get(newRequestId)); testFactory.triggerUnfulfillable(requests.get(newRequestId));
networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, null); networkCallback.expectCallback(CallbackEntry.UNAVAILABLE, (Network) null);
testFactory.waitForRequests(); testFactory.waitForRequests();
// unregister network callback - a no-op (since already freed by the // unregister network callback - a no-op (since already freed by the