Merge "Remove @FlakyTest on testTcpBufferReset" am: 3ae017a7d2

am: 5288706a9e Change-Id: I9d0f281003913f6bfe4ee31f654df8909f6d9c6a
2019-10-11 04:39:06 -07:00
parent 30baa870e5 5288706a9e
commit fe4c5bd059
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()