| commit | 81abd940f0ef03eac3f6e0192dc556cc8d6a0d7c | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Aug 20 13:26:05 2024 +0900 |
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Thu Aug 22 01:32:44 2024 +0000 |
| tree | 77a9c13a22ed5d6a710ce54ccd069867ce527483 | |
| parent | 881e47a9fe544a3f0248c0aaa765791cac13f98b [diff] |
Skip running restore default network monitor on instant mode. Instant mode does not have access to WifiManager Test: atest MultinetworkApiTest --instant Bug: 356644514 (cherry picked from https://android-review.googlesource.com/q/commit:d3d139a80df2ff2d5f9e914c48b158e311ad9829) Merged-In: I310cd8a614006c391407829ada587d892a0ac3b4 Change-Id: I310cd8a614006c391407829ada587d892a0ac3b4
diff --git a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt index a014834..d00ae52 100644 --- a/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt +++ b/staticlibs/testutils/devicetests/com/android/testutils/DevSdkIgnoreRunner.kt
@@ -61,8 +61,10 @@ private val shouldThreadLeakFailTest = klass.isAnnotationPresent(MonitorThreadLeak::class.java) private val restoreDefaultNetworkDesc = Description.createTestDescription(klass, "RestoreDefaultNetwork") - private val restoreDefaultNetwork = klass.isAnnotationPresent(RestoreDefaultNetwork::class.java) val ctx = ApplicationProvider.getApplicationContext<Context>() + private val restoreDefaultNetwork = + klass.isAnnotationPresent(RestoreDefaultNetwork::class.java) && + !ctx.applicationInfo.isInstantApp() // Inference correctly infers Runner & Filterable & Sortable for |baseRunner|, but the // Java bytecode doesn't have a way to express this. Give this type a name by wrapping it.