diff options
| author | Junyu Lai <junyulai@google.com> | 2020-08-28 11:09:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-28 11:09:43 +0000 |
| commit | 09ab7ad38626fb8ed1c71da78987d127efbc3526 (patch) | |
| tree | 051f82ee84104922177afa61378762b5f6583c97 /tests/net/java/com/android/server | |
| parent | 2555567ca26ace5827e7de61447cd90de0d422d8 (diff) | |
| parent | b5e1feccbe956d9fc3b2d6a4e40d434f88ef813e (diff) | |
Merge "Notify the keepalive is stopped after the slot has been released" am: 6d7c1854a8 am: b5e1feccbe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851
Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2
Diffstat (limited to 'tests/net/java/com/android/server')
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 285cbe58f147..57c356dae9f8 100644 --- 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"); |