diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2020-06-02 01:18:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-02 01:18:24 +0000 |
| commit | f72cb2a38ea6b2fa3973bd1deb191bc3bf6b64ee (patch) | |
| tree | 7e879dadc274321f8d07c2462ef8730284244766 | |
| parent | 09d8861d240d6f53e41101ca34ad30e6ff1b7c4a (diff) | |
| parent | b2a00f12049628a87c183978c0f5cb800ee3f2bf (diff) | |
Merge "Prevent race in NetworkMonitorTest" into rvc-dev am: 6d0b54800f am: b2a00f1204
Original change: undetermined
Change-Id: Ie0f512d0c17788549b7e06b134048ccce2196ff0
| -rw-r--r-- | tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java index 8734e9e..e72bcda 100644 --- a/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java +++ b/tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java @@ -1839,10 +1839,11 @@ public class NetworkMonitorTest { private void testDataStall_StallTcpSuspectedAndSendMetrics(int transport, NetworkCapabilities nc) throws Exception { assumeTrue(ShimUtils.isReleaseOrDevelopmentApiAbove(Build.VERSION_CODES.Q)); + setupTcpDataStall(); // NM suspects data stall from TCP signal and sends data stall metrics. setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_TCP); final WrappedNetworkMonitor nm = prepareNetworkMonitorForVerifyDataStall(nc); - setupTcpDataStall(); + // Trigger a tcp event immediately. setTcpPollingInterval(0); nm.sendTcpPollingEvent(); |