commit 65bb6527cdf5386773827c20b91e1ad4dfb7fa79
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 07 03:51:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 07 03:51:14 2024 +0000
tree d1aedf98d124f69d56be56d3ef1674a23e8632a6
parent 53f4a29816f04e47eb91429a0b1b7434538298a9
parent 986dd36e65aad9082f2bf13d5e7a25ea18110ead

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

tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt

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)