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

Merge "Address comments from aosp/1284557" am: 5e15788019

Browse Source 
Change-Id: I9a9525428506366eb66fb2e852c32af395d35f35
This commit is contained in:
Chalard Jean
2020-04-14 01:49:47 +00:00
committed by Automerger Merge Worker
parent 5921be3d7a 2cef9f7da5
commit 0682a9e302
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -281,7 +281,8 @@ class NetworkAgentTest {
} }
fun assertNoCallback() { fun assertNoCallback() {
assertTrue(waitForIdle(DEFAULT_TIMEOUT_MS), "Handler never became idle") assertTrue(waitForIdle(DEFAULT_TIMEOUT_MS),
"Handler didn't became idle after ${DEFAULT_TIMEOUT_MS}ms")
assertNull(history.peek()) assertNull(history.peek())
} }
} }
@@ -536,6 +537,10 @@ class NetworkAgentTest {
} }
agent.assertNoCallback() agent.assertNoCallback()
} }
}
@Test
fun testSetAcceptUnvalidatedPreventAutomaticReconnect() {
createNetworkAgentWithFakeCS().let { agent -> createNetworkAgentWithFakeCS().let { agent ->
mFakeConnectivityService.sendMessage(CMD_SAVE_ACCEPT_UNVALIDATED, 0) mFakeConnectivityService.sendMessage(CMD_SAVE_ACCEPT_UNVALIDATED, 0)
mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT) mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
@@ -552,6 +557,10 @@ class NetworkAgentTest {
mFakeConnectivityService.expectMessage(AsyncChannel.CMD_CHANNEL_DISCONNECTED) mFakeConnectivityService.expectMessage(AsyncChannel.CMD_CHANNEL_DISCONNECTED)
agent.expectCallback<OnNetworkUnwanted>() agent.expectCallback<OnNetworkUnwanted>()
} }
}
@Test
fun testPreventAutomaticReconnect() {
createNetworkAgentWithFakeCS().let { agent -> createNetworkAgentWithFakeCS().let { agent ->
mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT) mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
agent.expectCallback<OnAutomaticReconnectDisabled>() agent.expectCallback<OnAutomaticReconnectDisabled>()