Merge "Add timeout to waitForBroadcastIdle in UserLifecycleTests." into udc-dev (393f7b0e) · Commits · e / os / android_frameworks_base

apct-tests/perftests/multiuser/src/android/multiuser/UserLifecycleTests.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -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) {