Merge "Remove @FlakyTest on testTcpBufferReset" am: 23d3603ab8 am: 382568d4bc am: d90c2d6fd1

am: 5ffbf73b8b Change-Id: I41e30d81907e8a651d9bb982045276910944a4c2
2019-10-11 05:07:09 -07:00
parent 46d230b03e 5ffbf73b8b
commit 97c7ec6eee
1 changed files with 0 additions and 1 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -5709,7 +5709,6 @@ public class ConnectivityServiceTest {
    }

    @Test
-    @FlakyTest(bugId = 140305678)
    public void testTcpBufferReset() throws Exception {
        final String testTcpBufferSizes = "1,2,3,4,5,6";
        final NetworkRequest networkRequest = new NetworkRequest.Builder()