| commit | 1e0f207b4ea6c481333b265c8194766fae6f82d6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jun 07 04:08:21 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 07 04:08:21 2024 +0000 |
| tree | c3f23766af4a758506081c291b95e05227d6fa9b | |
| parent | 43b971e2e9b810e726d5d8d119f0961dea94a556 [diff] | |
| parent | 65bb6527cdf5386773827c20b91e1ad4dfb7fa79 [diff] |
Merge "waitForIdle to avoid stubbing mocked bpfNetMaps while CS is accessing" into main am: 65bb6527cd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3117159 Change-Id: Ibeb0eddcffcc1770f3b3108e93f9e21f98bdbeec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt index 0590fbb..3ad8de8 100644 --- a/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt +++ b/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt
@@ -387,6 +387,10 @@ BLOCKED_REASON_NETWORK_RESTRICTED or BLOCKED_REASON_APP_BACKGROUND ) } + // waitForIdle since stubbing bpfNetMaps while CS handler thread calls + // bpfNetMaps.getNetPermForUid throws exception. + // ConnectivityService might haven't finished checking blocked status for all requests. + waitForIdle() // Disable background firewall chain doReturn(BLOCKED_REASON_NONE)