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

Merge "Fix flaky UdpEncapsulationSocket test" am: 066b321400 am: 53e2f98e65

Browse Source 
am: 4be55d08d9

Change-Id: Iad9aea4b42cd8b31a5a2659bb9cb54dd1c64e8b7
This commit is contained in:
Lorenzo Colitti
2019-04-04 09:29:35 -07:00
committed by android-build-merger
parent 284fac581d 4be55d08d9
commit a4b7e088c1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/IpSecService.java
View File

@@ -96,9 +96,10 @@ public class IpSecService extends IIpSecService.Stub {
new int[] {OsConstants.AF_INET, OsConstants.AF_INET6}; new int[] {OsConstants.AF_INET, OsConstants.AF_INET6};
private static final int NETD_FETCH_TIMEOUT_MS = 5000; // ms private static final int NETD_FETCH_TIMEOUT_MS = 5000; // ms
private static final int MAX_PORT_BIND_ATTEMPTS = 10;
private static final InetAddress INADDR_ANY; private static final InetAddress INADDR_ANY;
@VisibleForTesting static final int MAX_PORT_BIND_ATTEMPTS = 10;
static { static {
try { try {
INADDR_ANY = InetAddress.getByAddress(new byte[] {0, 0, 0, 0}); INADDR_ANY = InetAddress.getByAddress(new byte[] {0, 0, 0, 0});