Merge "Fix flaky UdpEncapsulationSocket test" am: 066b321400

am: 53e2f98e65

Change-Id: Idf040a67e53d9b9ec6e6c647ce24f8ada501d355
This commit is contained in:
Lorenzo Colitti
2019-04-04 09:18:29 -07:00
committed by android-build-merger

View File

@@ -96,9 +96,10 @@ public class IpSecService extends IIpSecService.Stub {
new int[] {OsConstants.AF_INET, OsConstants.AF_INET6};
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;
@VisibleForTesting static final int MAX_PORT_BIND_ATTEMPTS = 10;
static {
try {
INADDR_ANY = InetAddress.getByAddress(new byte[] {0, 0, 0, 0});