From 986dd36e65aad9082f2bf13d5e7a25ea18110ead Mon Sep 17 00:00:00 2001
From: Motomu Utsumi <motomuman@google.com>
Date: Thu, 6 Jun 2024 18:04:08 +0900
Subject: [PATCH] waitForIdle to avoid stubbing mocked bpfNetMaps while CS is
 accessing

Bug: 343302460
Test: TH
Change-Id: I74683b20ce581206c47a153b0e2f348295363ecb
---
 .../server/connectivityservice/CSBlockedReasonsTest.kt        | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt b/tests/unit/java/com/android/server/connectivityservice/CSBlockedReasonsTest.kt
index 0590fbb63f..3ad8de89e1 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 @@ 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)