Merge "Use a longer test timeout in integration test" am: f652408e6c am: 7ffa156a73

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

Change-Id: Iac1fdb3d92501b292ecbff1f9a75bcecbcb23725
This commit is contained in:
Treehugger Robot
2021-03-25 02:36:19 +00:00
committed by Automerger Merge Worker

View File

@@ -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