Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 660a2c96 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use a longer test timeout in integration test" am: 565f1a95 am: e7da14af 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650287

Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725
parents 25104d78 e7da14af

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import kotlin.test.assertTrue 
import kotlin.test.fail



const val SERVICE_BIND_TIMEOUT_MS = 5_000L

const val TEST_TIMEOUT_MS = 1_000L

const val TEST_TIMEOUT_MS = 10_000L



/**

 * Test that exercises an instrumented version of ConnectivityService against an instrumented