From ffb22cd3eec12661571ddcf77605a895b4bdd95b Mon Sep 17 00:00:00 2001
From: Yuyang Huang <yuyanghuang@google.com>
Date: Wed, 18 Dec 2024 16:17:02 +0900
Subject: [PATCH] Increase CtsNetTestCases shell timeout to 25 minutes

Increased the shell timeout value for CtsNetTestCases from the default
10 minutes to 25 minutes. This change accommodates tests like
android.net.cts.ApfIntegrationTest#testReadWriteProgram, which can take
up to 15 minutes to complete, preventing
ShellCommandUnresponsiveException errors.

Bug: 383940149
Test: TH
(cherry picked from https://android-review.googlesource.com/q/commit:8e92dc13691f2862aea1961b04cdc3cdd683cbee)
Merged-In: I90b5465a85a85a58b7cb12931a52452fe961db8c
Change-Id: I90b5465a85a85a58b7cb12931a52452fe961db8c
---
 tests/cts/net/AndroidTestTemplate.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cts/net/AndroidTestTemplate.xml b/tests/cts/net/AndroidTestTemplate.xml
index a424b9085f..ba65038026 100644
--- a/tests/cts/net/AndroidTestTemplate.xml
+++ b/tests/cts/net/AndroidTestTemplate.xml
@@ -41,6 +41,7 @@
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="{PACKAGE}" />
+        <option name="shell-timeout" value="1500s"/>
         <option name="runtime-hint" value="9m4s" />
         <option name="hidden-api-checks" value="false" />
         <option name="isolated-storage" value="false" />