Merge changes I579b3cd9,Ib008e63c into main

* changes:
  Allow QuicConnectionCloser to close loopback QUIC connection
  Enable QUIC connection close by default in ConnectivityService
This commit is contained in:
Treehugger Robot 2025-04-27 22:20:38 -07:00 • committed by Android (Google) Code Review
commit 5ae058b9d4

View file

@ -4358,8 +4358,11 @@ public class ConnectivityManagerTest {
});
}
// This test is skipped on U and older releases because QUIC connection close can be triggered
// by the freezer (U+) or the background firewall chain (V+), but the freezer cannot be tested.
// TODO: Enable this test on T+ once other firewall chains can trigger QUIC connection close.
@Test
@IgnoreUpTo(Build.VERSION_CODES.R)
@IgnoreUpTo(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
@ConnectivityModuleTest
@AppModeFull(reason = "Cannot create test network in instant app mode")
public void testRegisterQuicConnectionClosePayload_blockNetwork() throws Exception {
@ -4384,8 +4387,9 @@ public class ConnectivityManagerTest {
true /* blockNetwork */, false /* expectPacketSent */);
}
// TODO: Enable this test on T+ once other firewall chains can trigger QUIC connection close.
@Test
@IgnoreUpTo(Build.VERSION_CODES.R)
@IgnoreUpTo(Build.VERSION_CODES.UPSIDE_DOWN_CAKE)
@ConnectivityModuleTest
@AppModeFull(reason = "Cannot create test network in instant app mode")
public void testRegisterQuicConnectionClosePayload_closeSocket() throws Exception {