From 5e9ac3d9768f31999ae2ca1a63a60eede3d4db0d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 07:31:55 +0000
Subject: [PATCH 1/2] Fix SocketBlockingModeTransitionTests on Android

Android behaves like Apple platforms for TCP Fast Open (TFO) - the
connectx/sendto syscall can complete connect+send in a single operation,
leaving the socket in blocking mode even on the async path. Update the
test to account for Android's behavior.

Fixes test failure in build 1385862:
https://dev.azure.com/dnceng-public/cbb18261-c48f-4abb-8651-8cdcb5474649/_build/results?buildId=1385862

Test: System.Net.Sockets.Tests.SocketBlockingModeTransitionTests.ConnectAsync_WithBuffer_Succeeds
Platform: android-x64 (and likely other Android architectures)
Helix job: 0d1226c0-0bbd-4f97-9615-2de51177394c
Work item: System.Net.Sockets.Tests

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 .../tests/FunctionalTests/Connect.Unix.cs                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.Unix.cs b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.Unix.cs
index 0766028d698d35..6a15e23d25a814 100644
--- a/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.Unix.cs
+++ b/src/libraries/System.Net.Sockets/tests/FunctionalTests/Connect.Unix.cs
@@ -220,11 +220,11 @@ public async Task ConnectAsync_WithBuffer_Succeeds()
             Assert.Equal(SocketError.Success, saea.SocketError);
             Assert.True(client.Blocking);
 
-            // On Apple platforms, TFO (connectx) may complete the connect+send in a single
-            // syscall, so the socket can end up blocking even on the async path.
+            // On Apple and Android platforms, TFO (connectx/sendto) may complete the connect+send
+            // in a single syscall, so the socket can end up blocking even on the async path.
             // On Linux, async connect always leaves the socket non-blocking when
             // buffer > 0 because SendToAsync is pending.
-            if (!completedAsync || PlatformDetection.IsApplePlatform)
+            if (!completedAsync || PlatformDetection.IsApplePlatform || PlatformDetection.IsAndroid)
             {
                 Assert.False(IsSocketNonBlocking(client));
             }

From f8aab5e2048974c2908778d4d473ba100dbf401e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 20 Apr 2026 07:32:00 +0000
Subject: [PATCH 2/2] ci: trigger checks