Merge "Notify the keepalive is stopped after the slot has been released"

2020-08-28 10:12:44 +00:00
parent e26f9b879f 75125f2131
commit c4aaac8af6
3 changed files with 38 additions and 20 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -218,7 +218,6 @@ import android.util.Log;
 import android.util.SparseArray;

 import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;

@@ -4028,7 +4027,6 @@ public class ConnectivityServiceTest {
    }

    @Test
-    @FlakyTest(bugId = 140305589)
    public void testPacketKeepalives() throws Exception {
        InetAddress myIPv4 = InetAddress.getByName("192.0.2.129");
        InetAddress notMyIPv4 = InetAddress.getByName("192.0.2.35");