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

Merge "Always send all available state when calling onAvailable()." am: 8fdbb6d6e2 am: b90963fe4d

Browse Source 
am: 3765538bab

Change-Id: Ic82e3cb92841ea99972faad6ae004d77c725831b
This commit is contained in:
Erik Kline
2017-03-07 06:08:40 +00:00
committed by android-build-merger
parent ca809f4260 b90963fe4d
commit 0fd4b155a5
3 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1176,15 +1176,11 @@ public class ConnectivityServiceTest extends AndroidTestCase {
void expectAvailableCallbacks(MockNetworkAgent agent, boolean expectSuspended, int timeoutMs) {
expectCallback(CallbackState.AVAILABLE, agent, timeoutMs);
final boolean HAS_DATASYNC_ON_AVAILABLE = false;
if (HAS_DATASYNC_ON_AVAILABLE) {
if (expectSuspended) {
expectCallback(CallbackState.SUSPENDED, agent, timeoutMs);
}
expectCallback(CallbackState.NETWORK_CAPABILITIES, agent, timeoutMs);
expectCallback(CallbackState.LINK_PROPERTIES, agent, timeoutMs);
if (expectSuspended) {
expectCallback(CallbackState.SUSPENDED, agent, timeoutMs);
}
expectCallback(CallbackState.NETWORK_CAPABILITIES, agent, timeoutMs);
expectCallback(CallbackState.LINK_PROPERTIES, agent, timeoutMs);
}
void expectAvailableCallbacks(MockNetworkAgent agent) {
@@ -1196,7 +1192,7 @@ public class ConnectivityServiceTest extends AndroidTestCase {
}
void expectAvailableAndValidatedCallbacks(MockNetworkAgent agent) {
expectAvailableCallbacks(agent, true, TIMEOUT_MS);
expectAvailableCallbacks(agent, false, TIMEOUT_MS);
expectCapabilitiesWith(NET_CAPABILITY_VALIDATED, agent);
}