Merge "waitForIdle to avoid stubbing mocked bpfNetMaps while CS is accessing" into main

2024-06-07 03:51:14 +00:00 · 2024-06-07 03:51:14 +00:00 · 65bb6527cd
commit 65bb6527cd
parent 53f4a29816 986dd36e65
1 changed files with 4 additions and 0 deletions
--- a/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt
+++ b/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt
@ -387,6 +387,10 @@ class CSBlockedReasonsTest : CSTest() {
                    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)