LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Notify the keepalive is stopped after the slot has been released" am: c4aaac8af6 am: b5e1feccbe

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2
This commit is contained in:
Junyu Lai
2020-08-28 11:09:43 +00:00
committed by Automerger Merge Worker
parent 0086f5d657 c4aaac8af6
commit d85c0d27b9
3 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -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");