From 3584f0cac4a3dc84c6832ebd30c0f2e443c19b88 Mon Sep 17 00:00:00 2001
From: Yasin Kilicdere <tyk@google.com>
Date: Tue, 25 Apr 2023 12:13:32 +0100
Subject: [PATCH] Add timeout to waitForBroadcastIdle in UserLifecycleTests.

Bug: 274491131
Test: atest UserLifecycleTests
Change-Id: I2eff4749f562e4e8e733cd991e70b8040c745906
---
 .../multiuser/src/android/multiuser/UserLifecycleTests.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
index fffdae22e6768..9ba94c8b9d119 100644
--- a/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
+++ b/apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java
@@ -1538,7 +1538,11 @@ public class UserLifecycleTests {
     }
 
     private void waitForBroadcastIdle() {
-        ShellHelper.runShellCommand("am wait-for-broadcast-idle");
+        try {
+            runShellCommandWithTimeout("am wait-for-broadcast-idle", TIMEOUT_IN_SECOND);
+        } catch (TimeoutException e) {
+            Log.e(TAG, "Ending waitForBroadcastIdle because it is taking too long", e);
+        }
     }
 
     private void sleep(long ms) {