Merge "Address comments from aosp/1284557" am: 5e15788019 am: 0682a9e302 am: 8b3dd8ac38 am: e47b02e248

Change-Id: I02034e74332f1e1d91ec04393f1ac2e66f40e2f2

tests/cts/net/src/android/net/cts/NetworkAgentTest.kt

@@ -281,7 +281,8 @@ class NetworkAgentTest {
         }
 
         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())
         }
     }
@@ -536,6 +537,10 @@ class NetworkAgentTest {
             }
             agent.assertNoCallback()
         }
+    }
+
+    @Test
+    fun testSetAcceptUnvalidatedPreventAutomaticReconnect() {
         createNetworkAgentWithFakeCS().let { agent ->
             mFakeConnectivityService.sendMessage(CMD_SAVE_ACCEPT_UNVALIDATED, 0)
             mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
@@ -552,6 +557,10 @@ class NetworkAgentTest {
             mFakeConnectivityService.expectMessage(AsyncChannel.CMD_CHANNEL_DISCONNECTED)
             agent.expectCallback<OnNetworkUnwanted>()
         }
+    }
+
+    @Test
+    fun testPreventAutomaticReconnect() {
         createNetworkAgentWithFakeCS().let { agent ->
             mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
             agent.expectCallback<OnAutomaticReconnectDisabled>()