From c3cb82a585cba37f94d3412455286a834f131fa3 Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Fri, 3 Feb 2023 15:55:56 +0000
Subject: [PATCH] Make the timeout for user removal 40 seconds in
 UserManagerTest.

BlockingBroadcastReceiver has 4 minutes of timeout by default. This
CL topic makes it customizable and sets it to 40 seconds for user
removal.

Bug: 267760314
Test: atest com.android.server.pm.UserManagerTest
Change-Id: Ib3017fd38357abe005a5a2aa5e9cd987cf5673ef
---
 .../src/com/android/server/pm/UserManagerTest.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
index 8a292cbab0f55..c7124d385a872 100644
--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java
@@ -72,6 +72,7 @@ public final class UserManagerTest {
     private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // 30 years
 
     private static final int SWITCH_USER_TIMEOUT_SECONDS = 40; // 40 seconds
+    private static final int REMOVE_USER_TIMEOUT_SECONDS = 40; // 40 seconds
 
     // Packages which are used during tests.
     private static final String[] PACKAGES = new String[] {
@@ -1472,6 +1473,7 @@ public final class UserManagerTest {
         BlockingBroadcastReceiver blockingBroadcastReceiver = BlockingBroadcastReceiver.create(
                 mContext, Intent.ACTION_USER_REMOVED, checker);
 
+        blockingBroadcastReceiver.setTimeout(REMOVE_USER_TIMEOUT_SECONDS);
         blockingBroadcastReceiver.register();
 
         try (blockingBroadcastReceiver) {