| commit | 0d7cad336276fa6f99b1ba639b004eea3a75c19f | [log] [tgz] |
|---|---|---|
| author | Motomu Utsumi <motomuman@google.com> | Tue Aug 20 06:22:27 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 20 06:22:27 2024 +0000 |
| tree | 5752eb7380edf66eaa804d91c8c0b2549e75306d | |
| parent | 59061ebbb6024c3e8f35aca5df79a50bee79c2bf [diff] | |
| parent | 63488f47987f8c01c88b8eba5f1524caaf145d60 [diff] |
Merge "Skip running restore default network monitor on instant mode." into main am: 63488f4798 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3228665 Change-Id: I657d26101023b2aa5fc5044085aad9f285b054a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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.