commit 0162c35e7cebe6f90de737d121b2f94c835431f3
author android-build-prod (mdb) <android-build-team-robot@google.com> Fri Apr 10 20:07:39 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 10 20:07:39 2020 +0000
tree 6b58ddef7e92f741a2623a453fbd30ce02de9b36
parent f4903a34e15f8f1a2781890f924faf1bd1bdeb92
parent df868b46c5e62a6bd0be5ac9be487f18e4290d86

Merge "Snap for 6383024 from a806fa9599f04b7f8bfffce937305043b3c86673 to android10-tests-release" into android10-tests-release

luni/src/test/java/libcore/java/net/OldSocketTest.java

diff --git a/luni/src/test/java/libcore/java/net/OldSocketTest.java b/luni/src/test/java/libcore/java/net/OldSocketTest.java
index f20f93d..644fe52 100644
--- a/luni/src/test/java/libcore/java/net/OldSocketTest.java
+++ b/luni/src/test/java/libcore/java/net/OldSocketTest.java
@@ -1269,9 +1269,6 @@
         }
     }
 
-    @DisableResourceLeakageDetection(
-            why = "Strange threading behavior causes resource leak",
-            bug = "31820278")
     public void test_connectLjava_net_SocketAddressI_setSOTimeout() throws Exception {
         final AtomicReference<Exception> exceptionRef = new AtomicReference<>();
 
@@ -1298,6 +1295,9 @@
 
         // Now try to set options while we are connecting
         try (final Socket theSocket = new Socket()) {
+            // Force SocketImpl creation to prevent race between connect() and setSoTimeout()
+            // creating it. b/144258500
+            theSocket.getSoTimeout();
             final SocketConnector connector
                 = new SocketConnector(5000, theSocket, UNREACHABLE_ADDRESS);
             connector.start();