Merge "Fix flaky UdpEncapsulationSocket test"

2019-04-04 08:09:06 +00:00
parent ed2eb961e8 29c3077ce0
commit 066b321400
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/IpSecService.java
+++ b/services/core/java/com/android/server/IpSecService.java
@@ -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});